ixgbe: set max desc to prevent total RSC packet size of 64K
Subsystems (2)
PATCH 1/3 ixgbe: set max desc to prevent total RSC packet size of 64K
From: Alexander Duyck <[email protected]>
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.
---
drivers/net/ixgbe/ixgbe.h | 2 ++ drivers/net/ixgbe/ixgbe_main.c | 29 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-)
drivers/net/ixgbe/ixgbe.h +2 -0
@@ -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
drivers/net/ixgbe/ixgbe_main.c +18 -11
@@ -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 */
PATCH 2/3 ixgbe: Add generic XAUI support to 82599
From: Peter P Waskiewicz Jr <[email protected]>
This patch adds the generic XAUI device support for 82599 controllers.
---
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(-)
drivers/net/ixgbe/ixgbe_82599.c +3 -0
@@ -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 :
drivers/net/ixgbe/ixgbe_main.c +2 -0
@@ -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 },
drivers/net/ixgbe/ixgbe_type.h +2 -0
@@ -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 0x1000enum ixgbe_eeprom_type { ixgbe_eeprom_uninitialized =0 ,
Re: [net-next-2.6 PATCH 2/3] ixgbe: Add generic XAUI support to 82599
From: Jeff Kirsher <[email protected]>
Date: Sun, 17 May 2009 23:58:04 -0700
Quoted 6 lines
From: Peter P Waskiewicz Jr <[email protected]>
This patch adds the generic XAUI device support for 82599 controllers.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/3 ixgbe: Increase the driver version number
In reply to Jeff KirsherFrom: Peter P Waskiewicz Jr <[email protected]>
Marching along, let's bump the version number to indicate things actually have happened to the driver.
---
drivers/net/ixgbe/ixgbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -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." ;
Re: [net-next-2.6 PATCH 3/3] ixgbe: Increase the driver version number
From: Jeff Kirsher <[email protected]>
Date: Sun, 17 May 2009 23:58:21 -0700
Quoted 7 lines
From: Peter P Waskiewicz Jr <[email protected]>
Marching along, let's bump the version number to indicate things actually have happened to the driver.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Sun, 17 May 2009 23:57:47 -0700
Quoted 8 lines
From: Alexander Duyck <[email protected]>
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 <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.