* [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K
@ 2009-05-18 6:57 Jeff Kirsher
2009-05-18 6:58 ` [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 Jeff Kirsher
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jeff Kirsher @ 2009-05-18 6:57 UTC (permalink / raw)
To: davem; +Cc: netdev, Alexander Duyck, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
The performance of hardware RSC is greatly reduced if the total for max rsc
descriptors multiplied by the buffer size is greater than 65535. To
prevent this we need to adjust the max rsc descriptors appropriately.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ixgbe/ixgbe.h | 2 ++
drivers/net/ixgbe/ixgbe_main.c | 29 ++++++++++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index d291d1c..05a2405 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -75,6 +75,8 @@
#define IXGBE_RXBUFFER_128 128 /* Used for packet split */
#define IXGBE_RXBUFFER_256 256 /* Used for packet split */
#define IXGBE_RXBUFFER_2048 2048
+#define IXGBE_RXBUFFER_4096 4096
+#define IXGBE_RXBUFFER_8192 8192
#define IXGBE_MAX_RXBUFFER 16384 /* largest size for a single descriptor */
#define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_256
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index b53f265..4ab17ab 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1995,21 +1995,28 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
rscctrl = IXGBE_READ_REG(hw, IXGBE_RSCCTL(j));
rscctrl |= IXGBE_RSCCTL_RSCEN;
/*
- * if packet split is enabled we can only support up
- * to max frags + 1 descriptors.
+ * we must limit the number of descriptors so that the
+ * total size of max desc * buf_len is not greater
+ * than 65535
*/
- if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)
-#if (MAX_SKB_FRAGS < 3)
- rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
-#elif (MAX_SKB_FRAGS < 7)
- rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
-#elif (MAX_SKB_FRAGS < 15)
+ if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+#if (MAX_SKB_FRAGS > 16)
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+#elif (MAX_SKB_FRAGS > 8)
rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
+#elif (MAX_SKB_FRAGS > 4)
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
#else
- rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
#endif
- else
- rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+ } else {
+ if (rx_buf_len < IXGBE_RXBUFFER_4096)
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+ else if (rx_buf_len < IXGBE_RXBUFFER_8192)
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
+ else
+ rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
+ }
IXGBE_WRITE_REG(hw, IXGBE_RSCCTL(j), rscctrl);
}
/* Disable RSC for ACK packets */
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 2009-05-18 6:57 [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K Jeff Kirsher @ 2009-05-18 6:58 ` Jeff Kirsher 2009-05-18 22:10 ` David Miller 2009-05-18 6:58 ` [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number Jeff Kirsher 2009-05-18 22:10 ` [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K David Miller 2 siblings, 1 reply; 6+ messages in thread From: Jeff Kirsher @ 2009-05-18 6:58 UTC (permalink / raw) To: davem; +Cc: netdev, Peter P Waskiewicz Jr, Jeff Kirsher From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> This patch adds the generic XAUI device support for 82599 controllers. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- drivers/net/ixgbe/ixgbe_82599.c | 3 +++ drivers/net/ixgbe/ixgbe_main.c | 2 ++ drivers/net/ixgbe/ixgbe_type.h | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index eaecf5e..39d7b64 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c @@ -347,6 +347,7 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) switch (hw->device_id) { case IXGBE_DEV_ID_82599: case IXGBE_DEV_ID_82599_KX4: + case IXGBE_DEV_ID_82599_XAUI_LOM: /* Default device ID is mezzanine card KX/KX4 */ media_type = ixgbe_media_type_backplane; break; @@ -1199,6 +1200,8 @@ u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4; else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4) physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4; + else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI) + physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI; goto out; break; case IXGBE_AUTOC_LMS_10G_SERIAL: diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 4ab17ab..f9f8831 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -90,6 +90,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { board_82598 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM), + board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), board_82599 }, diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h index cb73b30..ba3ed0f 100644 --- a/drivers/net/ixgbe/ixgbe_type.h +++ b/drivers/net/ixgbe/ixgbe_type.h @@ -49,6 +49,7 @@ #define IXGBE_DEV_ID_82599 0x10D8 #define IXGBE_DEV_ID_82599_KX4 0x10F7 #define IXGBE_DEV_ID_82599_SFP 0x10FB +#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC /* General Registers */ #define IXGBE_CTRL 0x00000 @@ -1954,6 +1955,7 @@ typedef u32 ixgbe_physical_layer; #define IXGBE_PHYSICAL_LAYER_1000BASE_KX 0x0200 #define IXGBE_PHYSICAL_LAYER_1000BASE_BX 0x0400 #define IXGBE_PHYSICAL_LAYER_10GBASE_KR 0x0800 +#define IXGBE_PHYSICAL_LAYER_10GBASE_XAUI 0x1000 enum ixgbe_eeprom_type { ixgbe_eeprom_uninitialized = 0, ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 2009-05-18 6:58 ` [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 Jeff Kirsher @ 2009-05-18 22:10 ` David Miller 0 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2009-05-18 22:10 UTC (permalink / raw) To: jeffrey.t.kirsher; +Cc: netdev, peter.p.waskiewicz.jr From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Sun, 17 May 2009 23:58:04 -0700 > From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > > This patch adds the generic XAUI device support for 82599 controllers. > > Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number 2009-05-18 6:57 [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K Jeff Kirsher 2009-05-18 6:58 ` [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 Jeff Kirsher @ 2009-05-18 6:58 ` Jeff Kirsher 2009-05-18 22:10 ` David Miller 2009-05-18 22:10 ` [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K David Miller 2 siblings, 1 reply; 6+ messages in thread From: Jeff Kirsher @ 2009-05-18 6:58 UTC (permalink / raw) To: davem; +Cc: netdev, Peter P Waskiewicz Jr, Jeff Kirsher From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Marching along, let's bump the version number to indicate things actually have happened to the driver. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- drivers/net/ixgbe/ixgbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index f9f8831..d342619 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe"; static const char ixgbe_driver_string[] = "Intel(R) 10 Gigabit PCI Express Network Driver"; -#define DRV_VERSION "2.0.16-k2" +#define DRV_VERSION "2.0.24-k2" const char ixgbe_driver_version[] = DRV_VERSION; static char ixgbe_copyright[] = "Copyright (c) 1999-2009 Intel Corporation."; ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number 2009-05-18 6:58 ` [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number Jeff Kirsher @ 2009-05-18 22:10 ` David Miller 0 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2009-05-18 22:10 UTC (permalink / raw) To: jeffrey.t.kirsher; +Cc: netdev, peter.p.waskiewicz.jr From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Sun, 17 May 2009 23:58:21 -0700 > From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > > Marching along, let's bump the version number to indicate things actually > have happened to the driver. > > Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K 2009-05-18 6:57 [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K Jeff Kirsher 2009-05-18 6:58 ` [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 Jeff Kirsher 2009-05-18 6:58 ` [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number Jeff Kirsher @ 2009-05-18 22:10 ` David Miller 2 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2009-05-18 22:10 UTC (permalink / raw) To: jeffrey.t.kirsher; +Cc: netdev, alexander.h.duyck From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Sun, 17 May 2009 23:57:47 -0700 > From: Alexander Duyck <alexander.h.duyck@intel.com> > > The performance of hardware RSC is greatly reduced if the total for max rsc > descriptors multiplied by the buffer size is greater than 65535. To > prevent this we need to adjust the max rsc descriptors appropriately. > > Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-05-18 22:10 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-05-18 6:57 [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K Jeff Kirsher 2009-05-18 6:58 ` [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599 Jeff Kirsher 2009-05-18 22:10 ` David Miller 2009-05-18 6:58 ` [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number Jeff Kirsher 2009-05-18 22:10 ` David Miller 2009-05-18 22:10 ` [net-next-2.6 PATCH 1/3] ixgbe: set max desc to prevent total RSC packet size of 64K David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox