Skip to contentSkip to conversation

bnx2: Use CPU native page size

PATCH Applied Michael Chan 2 participants 4 messages Jun 13, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/6 bnx2: Use CPU native page size

Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems.

drivers/net/bnx2.c +3 -2
index 49c09da..7a3d888 100644
@@ -32,6 +32,7 @@
 #include <asm/irq.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
+#include <asm/page.h>
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
@@ -3270,13 +3271,13 @@ bnx2_init_chip(struct bnx2 *bp)
 	REG_WR(bp, BNX2_MQ_KNL_BYP_WIND_START, val);
 	REG_WR(bp, BNX2_MQ_KNL_WIND_END, val);
 
-	val = (BCM_PAGE_BITS - 8) << 24;
+	val = (PAGE_SHIFT - 8) << 24;
 	REG_WR(bp, BNX2_RV2P_CONFIG, val);
 
 	/* Configure page size. */
 	val = REG_RD(bp, BNX2_TBDR_CONFIG);
 	val &= ~BNX2_TBDR_CONFIG_PAGE_SIZE;
-	val |= (BCM_PAGE_BITS - 8) << 24 | 0x40;
+	val |= (PAGE_SHIFT - 8) << 24 | 0x40;
 	REG_WR(bp, BNX2_TBDR_CONFIG, val);
 
 	val = bp->mac_addr[0] +
drivers/net/bnx2.h +3 -6
index ea1ab06..de2b58c 100644
@@ -3750,14 +3750,11 @@ struct l2_fhdr {
 #define DMA_READ_CHANS	5
 #define DMA_WRITE_CHANS	3
 
-#define BCM_PAGE_BITS	12
-#define BCM_PAGE_SIZE	(1 << BCM_PAGE_BITS)
-
-#define TX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct tx_bd))
+#define TX_DESC_CNT  (PAGE_SIZE / sizeof(struct tx_bd))
 #define MAX_TX_DESC_CNT (TX_DESC_CNT - 1)
 
 #define MAX_RX_RINGS	4
-#define RX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct rx_bd))
+#define RX_DESC_CNT  (PAGE_SIZE / sizeof(struct rx_bd))
 #define MAX_RX_DESC_CNT (RX_DESC_CNT - 1)
 #define MAX_TOTAL_RX_DESC_CNT (MAX_RX_DESC_CNT * MAX_RX_RINGS)
 
@@ -3773,7 +3770,7 @@ struct l2_fhdr {
 
 #define RX_RING_IDX(x) ((x) & bp->rx_max_ring_idx)
 
-#define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> 8)
+#define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> (PAGE_SHIFT - 4))
 #define RX_IDX(x) ((x) & MAX_RX_DESC_CNT)
 
 /* Context size. */
maintainer
#1 lore raw

From: "Michael Chan" <[email protected]>
Date: Mon, 12 Jun 2006 17:17:13 -0700

Quoted 4 lines

Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems.

Are you sure you want to do this when the base page size is up to 64K on some IA64/PowerPC64/Sparc64 configurations?

Maybe you can use a limit with some ifdef tests, something like:

#if PAGE_SHIFT > 13
#define BCM_PAGE_BITS 13
#else
#define BCM_PAGE_BITS PAGE_SHIFT
#endif

which would limit it to 8K.

#2 lore raw
Quoted 13 lines · David Miller

From: "Michael Chan" <[email protected]>
Date: Mon, 12 Jun 2006 17:17:13 -0700

Quoted 4 lines

Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems.

Are you sure you want to do this when the base page size is up to 64K on some IA64/PowerPC64/Sparc64 configurations?

Maybe you can use a limit with some ifdef tests, something like:

Quoted 8 lines

#if PAGE_SHIFT > 13
#define BCM_PAGE_BITS 13
#else
#define BCM_PAGE_BITS PAGE_SHIFT
#endif

which would limit it to 8K.

Yes, this makes sense. Here's the revised patch:

Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems.

Added check to limit the page size to 16K since that's the maximum rx ring size that will be used. This will prevent using unnecessarily large page sizes on some architectures with large page sizes. [Suggested by David Miller]

drivers/net/bnx2.c +1 -0
index 49c09da..cefb129 100644
@@ -32,6 +32,7 @@
 #include <asm/irq.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
+#include <asm/page.h>
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
drivers/net/bnx2.h +7 -2
index ea1ab06..69cebd9 100644
@@ -3750,7 +3750,12 @@ struct l2_fhdr {
 #define DMA_READ_CHANS	5
 #define DMA_WRITE_CHANS	3
 
-#define BCM_PAGE_BITS	12
+/* Use CPU native page size up to 16K for the ring sizes.  */
+#if (PAGE_SHIFT > 14)
+#define BCM_PAGE_BITS	14
+#else
+#define BCM_PAGE_BITS	PAGE_SHIFT
+#endif
 #define BCM_PAGE_SIZE	(1 << BCM_PAGE_BITS)
 
 #define TX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct tx_bd))
@@ -3773,7 +3778,7 @@ struct l2_fhdr {
 
 #define RX_RING_IDX(x) ((x) & bp->rx_max_ring_idx)
 
-#define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> 8)
+#define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> (BCM_PAGE_BITS - 4))
 #define RX_IDX(x) ((x) & MAX_RX_DESC_CNT)
 
 /* Context size. */
maintainer
#3 lore raw

From: "Michael Chan" <[email protected]>
Date: Tue, 13 Jun 2006 11:19:42 -0700

Quoted 9 lines

Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems.

Added check to limit the page size to 16K since that's the maximum rx ring size that will be used. This will prevent using unnecessarily large page sizes on some architectures with large page sizes. [Suggested by David Miller]

Looks great, applied.