Drop a redundant set of FPA pool definitions.

4 files changed, 8 insertions, 38 deletions

diff --git a/sys/arch/octeon/dev/cn30xxfpavar.h b/sys/arch/octeon/dev/cn30xxfpavar.h
index 4e5c57b1802..c3c01d64d0c 100644
--- a/sys/arch/octeon/dev/cn30xxfpavar.h
+++ b/sys/arch/octeon/dev/cn30xxfpavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxfpavar.h,v 1.3 2013/06/01 22:20:35 jasper Exp $	*/
+/*	$OpenBSD: cn30xxfpavar.h,v 1.4 2016/05/24 14:06:39 visa Exp $	*/
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
  * All rights reserved.
@@ -56,36 +56,6 @@ void	cn30xxfpa_dump(void);
 
 #define CACHE_LINE_SIZE (128)
 
-/* Pool sizes in bytes, must be multiple of a cache line */
-#define FPA_POOL_0_SIZE (16 * CACHE_LINE_SIZE)
-#define FPA_POOL_1_SIZE (1 * CACHE_LINE_SIZE)
-#define FPA_POOL_2_SIZE (8 * CACHE_LINE_SIZE)
-#define FPA_POOL_3_SIZE (4 * CACHE_LINE_SIZE)
-
-#define FPA_POOL_4_SIZE (16 * CACHE_LINE_SIZE)
-#define FPA_POOL_5_SIZE (16 * CACHE_LINE_SIZE)
-#define FPA_POOL_6_SIZE (16 * CACHE_LINE_SIZE)
-#define FPA_POOL_7_SIZE (16 * CACHE_LINE_SIZE)
-
-/* Pools in use */
-#define FPA_RECV_PKT_POOL		(0)	/* Recieve Packet buffers */
-#define FPA_RECV_PKT_POOL_SIZE		FPA_POOL_0_SIZE
-#define FPA_RECV_PKT_POOL_LINE		16
-#define FPA_WQE_POOL			(1)	/* Work queue entrys */
-#define FPA_WQE_POOL_SIZE		FPA_POOL_1_SIZE
-#define FPA_WQE_POOL_LINE		1
-#define FPA_COMMAND_BUFFER_POOL		(2)	/* PKO queue command buffers */
-#define FPA_COMMAND_BUFFER_POOL_SIZE	FPA_POOL_2_SIZE
-#define FPA_COMMAND_BUFFER_POOL_LINE	8
-#define FPA_GATHER_BUFFER_POOL		(3)	/* PKO gather list buffers */
-#define FPA_GATHER_BUFFER_POOL_SIZE	FPA_POOL_3_SIZE
-#define FPA_GATHER_BUFFER_POOL_LINE	4
-
-#ifndef FPA_OUTPUT_BUFFER_POOL
-#define FPA_OUTPUT_BUFFER_POOL		FPA_COMMAND_BUFFER_POOL
-#define FPA_OUTPUT_BUFFER_POOL_SIZE	FPA_COMMAND_BUFFER_POOL_SIZE
-#endif
-
 /*
  * operations
  */
diff --git a/sys/arch/octeon/dev/cn30xxipd.c b/sys/arch/octeon/dev/cn30xxipd.c
index 197c005117c..39e9dc974a8 100644
--- a/sys/arch/octeon/dev/cn30xxipd.c
+++ b/sys/arch/octeon/dev/cn30xxipd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxipd.c,v 1.7 2016/01/22 01:18:44 jsg Exp $	*/
+/*	$OpenBSD: cn30xxipd.c,v 1.8 2016/05/24 14:06:39 visa Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -126,7 +126,7 @@ cn30xxipd_config(struct cn30xxipd_softc *sc)
 	/* XXX */
 
 	packet_mbuff_size = 0;
-	SET(packet_mbuff_size, (FPA_RECV_PKT_POOL_SIZE / 8) &
+	SET(packet_mbuff_size, (OCTEON_POOL_SIZE_PKT / 8) &
 	    IPD_PACKET_MBUFF_SIZE_MB_SIZE);
 	_IPD_WR8(sc, IPD_PACKET_MBUFF_SIZE_OFFSET, packet_mbuff_size);
 
@@ -140,7 +140,7 @@ cn30xxipd_config(struct cn30xxipd_softc *sc)
 	_IPD_WR8(sc, IPD_2ND_NEXT_PTR_BACK_OFFSET, second_next_ptr_back);
 
 	sqe_fpa_queue = 0;
-	SET(sqe_fpa_queue, FPA_WQE_POOL & IPD_WQE_FPA_QUEUE_WQE_QUE);
+	SET(sqe_fpa_queue, OCTEON_POOL_NO_WQE & IPD_WQE_FPA_QUEUE_WQE_QUE);
 	_IPD_WR8(sc, IPD_WQE_FPA_QUEUE_OFFSET, sqe_fpa_queue);
 
 	ctl_status = _IPD_RD8(sc, IPD_CTL_STATUS_OFFSET);
diff --git a/sys/arch/octeon/dev/cn30xxpko.c b/sys/arch/octeon/dev/cn30xxpko.c
index f78da1501c2..3ab4c5b00a9 100644
--- a/sys/arch/octeon/dev/cn30xxpko.c
+++ b/sys/arch/octeon/dev/cn30xxpko.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxpko.c,v 1.4 2014/08/11 18:29:56 miod Exp $	*/
+/*	$OpenBSD: cn30xxpko.c,v 1.5 2016/05/24 14:06:39 visa Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -160,7 +160,7 @@ cn30xxpko_port_config(struct cn30xxpko_softc *sc)
 
 	KASSERT(sc->sc_port < 32);
 
-	buf_ptr = cn30xxfpa_load(FPA_COMMAND_BUFFER_POOL);
+	buf_ptr = cn30xxfpa_load(OCTEON_POOL_NO_CMD);
 	if (buf_ptr == 0)
 		return 1;
 
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index 268349d5898..8ada7747765 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.48 2016/05/24 12:56:14 visa Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.49 2016/05/24 14:06:39 visa Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -756,7 +756,7 @@ octeon_eth_send_makecmd_w1(int size, paddr_t addr)
 {
 	return cn30xxpko_cmd_word1(
 		0, 0,				/* i, back */
-		FPA_GATHER_BUFFER_POOL,		/* pool */
+		OCTEON_POOL_NO_SG,		/* pool */
 		size, addr);			/* size, addr */
 }