ixgbe: always set header length in SRRCTL
Subsystems (2)
PATCH 1/5 ixgbe: always set header length in SRRCTL
From: Alexander Duyck <[email protected]>
As per the documentation for 82599 in order to support hardware RSC the header size must be set. This is only currently done for packet split mode. This patch sets the header buffer length for all modes.
---
drivers/net/ixgbe/ixgbe_main.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +10 -18
@@ -1754,28 +1754,20 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index) srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK ; srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK ; + srrctl |= (IXGBE_RX_HDR_SIZE <<IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT ) & +IXGBE_SRRCTL_BSIZEHDR_MASK ; +if (adapter->flags &IXGBE_FLAG_RX_PS_ENABLED ) { -u16 bufsz =IXGBE_RXBUFFER_2048 ; -/* grow the amount we can receive on large page machines */ -if (bufsz < (PAGE_SIZE /2 )) - bufsz = (PAGE_SIZE /2 ); -/* cap the bufsz at our largest descriptor size */ - bufsz =min ((u16 )IXGBE_MAX_RXBUFFER , bufsz); - - srrctl |= bufsz >>IXGBE_SRRCTL_BSIZEPKT_SHIFT ; +#if (PAGE_SIZE /2 ) >IXGBE_MAX_RXBUFFER + srrctl |=IXGBE_MAX_RXBUFFER >>IXGBE_SRRCTL_BSIZEPKT_SHIFT ; +#else + srrctl |= (PAGE_SIZE /2 ) >>IXGBE_SRRCTL_BSIZEPKT_SHIFT ; +#endif srrctl |=IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS ; - srrctl |= ((IXGBE_RX_HDR_SIZE << -IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT ) & -IXGBE_SRRCTL_BSIZEHDR_MASK ); }else { + srrctl |=ALIGN (rx_ring->rx_buf_len,1024 ) >> +IXGBE_SRRCTL_BSIZEPKT_SHIFT ; srrctl |=IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF ; - -if (rx_ring->rx_buf_len ==MAXIMUM_ETHERNET_VLAN_SIZE ) - srrctl |=IXGBE_RXBUFFER_2048 >> -IXGBE_SRRCTL_BSIZEPKT_SHIFT ; -else - srrctl |= rx_ring->rx_buf_len >> -IXGBE_SRRCTL_BSIZEPKT_SHIFT ; }IXGBE_WRITE_REG (&adapter->hw,IXGBE_SRRCTL (index), srrctl);
PATCH 2/5 ixgbe: set queue0 for srrctl configuration correctly for DCB
From: Alexander Duyck <[email protected]>
The current configuration is not setting queue 0 correctly for DCB configurations. As a result unconfigured queues are being used to setup the SRRCTL register rx buffer len sizes.
---
drivers/net/ixgbe/ixgbe_main.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +12 -1
@@ -1740,7 +1740,18 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index)unsigned long mask;if (adapter->hw.mac.type == ixgbe_mac_82599EB) { - queue0 = index; +if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) { +int dcb_i = adapter->ring_feature[RING_F_DCB ].indices; +if (dcb_i ==8 ) + queue0 = index >>4 ; +else if (dcb_i ==4 ) + queue0 = index >>5 ; +else +dev_err (&adapter->pdev->dev,"Invalid DCB " +"configuration\n" ); + }else { + queue0 = index; + } }else { mask = (unsigned long ) adapter->ring_feature[RING_F_RSS ].mask; queue0 = index & mask;
Re: [net-next-2.6 PATCH 2/5] ixgbe: set queue0 for srrctl configuration correctly for DCB
From: Jeff Kirsher <[email protected]>
Date: Thu, 07 May 2009 13:39:16 -0700
Quoted 6 lines
The current configuration is not setting queue 0 correctly for DCB configurations. As a result unconfigured queues are being used to setup the SRRCTL register rx buffer len sizes.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/5 ixgbe: Enable L2 header split in 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This enables L2 header split when packet split is enabled for 82599.
---
drivers/net/ixgbe/ixgbe_main.c | 3 ++- drivers/net/ixgbe/ixgbe_type.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +2 -1
@@ -1818,7 +1818,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)u32 psrtype =IXGBE_PSRTYPE_TCPHDR |IXGBE_PSRTYPE_UDPHDR |IXGBE_PSRTYPE_IPV4HDR | -IXGBE_PSRTYPE_IPV6HDR ; +IXGBE_PSRTYPE_IPV6HDR | +IXGBE_PSRTYPE_L2HDR ;IXGBE_WRITE_REG (hw,IXGBE_PSRTYPE (0 ), psrtype); } }else {
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -1604,6 +1604,7 @@#define IXGBE_PSRTYPE_UDPHDR 0x00000020#define IXGBE_PSRTYPE_IPV4HDR 0x00000100#define IXGBE_PSRTYPE_IPV6HDR 0x00000200 +#define IXGBE_PSRTYPE_L2HDR 0x00001000/* SRRCTL bit definitions */ #define IXGBE_SRRCTL_BSIZEPKT_SHIFT 10/* so many KBs */
Re: [net-next-2.6 PATCH 3/5] ixgbe: Enable L2 header split in 82599
From: Jeff Kirsher <[email protected]>
Date: Thu, 07 May 2009 13:39:35 -0700
Quoted 4 lines
This enables L2 header split when packet split is enabled for 82599.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 4/5 ixgbe: fix failing to log fan failures
In reply to Jeff KirsherFrom: Don Skidmore <[email protected]>
We weren't logging the 82598AT fan failure if it occurred before (ixgbe_open) as we hadn't sent up to catch the interrupt that event caused.
This patch checks for this failure in:ixgbe_probe - So we can log the failure asap. We check right after we set up the adapter->flags, which is when we know that we have a fan. ixgbe_up_complete - To catch failures that may have happened between probe and when we set up the interrupt that would normally detect the fan failure.
To enable all of this we need to initialize the adapter flag with IXGBE_FLAG_FAN_FAIL_CAPABLE when the NIC contained a fan.
---
drivers/net/ixgbe/ixgbe_main.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +26 -2
@@ -2458,6 +2458,17 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)ixgbe_irq_enable (adapter);/* +* If this adapter has a fan, check to see if we had a failure +* before we enabled the interrupt. +*/ +if (adapter->flags &IXGBE_FLAG_FAN_FAIL_CAPABLE ) { +u32 esdp =IXGBE_READ_REG (hw,IXGBE_ESDP ); +if (esdp &IXGBE_ESDP_SDP1 ) +DPRINTK (DRV ,CRIT , +"Fan has stopped, replace the adapter\n" ); + } + +/* * For hot-pluggable SFP+ devices, a new SFP+ module may have * arrived before interrupts were enabled. We need to kick off * the SFP+ module setup first, then try to bring up link.
@@ -3382,9 +3393,11 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) adapter->ring_feature[RING_F_RSS ].indices = rss; adapter->flags |=IXGBE_FLAG_RSS_ENABLED ; adapter->ring_feature[RING_F_DCB ].indices =IXGBE_MAX_DCB_INDICES ; -if (hw->mac.type == ixgbe_mac_82598EB) +if (hw->mac.type == ixgbe_mac_82598EB) { +if (hw->device_id ==IXGBE_DEV_ID_82598AT ) + adapter->flags |=IXGBE_FLAG_FAN_FAIL_CAPABLE ; adapter->max_msix_q_vectors =MAX_MSIX_Q_VECTORS_82598 ; -else if (hw->mac.type == ixgbe_mac_82599EB) { + }else if (hw->mac.type == ixgbe_mac_82599EB) { adapter->max_msix_q_vectors =MAX_MSIX_Q_VECTORS_82599 ; adapter->flags |=IXGBE_FLAG_RSC_CAPABLE ; adapter->flags |=IXGBE_FLAG_RSC_ENABLED ;
@@ -4915,6 +4928,17 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,if (err) goto err_sw_init; +/* +* If there is a fan on this device and it has failed log the +* failure. +*/ +if (adapter->flags &IXGBE_FLAG_FAN_FAIL_CAPABLE ) { +u32 esdp =IXGBE_READ_REG (hw,IXGBE_ESDP ); +if (esdp &IXGBE_ESDP_SDP1 ) +DPRINTK (PROBE ,CRIT , +"Fan has stopped, replace the adapter\n" ); + } +/* reset_hw fills in the perm_addr as well */ err = hw->mac.ops.reset_hw (hw);if (err ==IXGBE_ERR_SFP_NOT_SUPPORTED ) {
Re: [net-next-2.6 PATCH 4/5] ixgbe: fix failing to log fan failures
From: Jeff Kirsher <[email protected]>
Date: Thu, 07 May 2009 13:39:54 -0700
Quoted 9 lines
We weren't logging the 82598AT fan failure if it occurred before (
ixgbe_open) as we hadn't sent up to catch the interrupt that event caused.This patch checks for this failure in:
ixgbe_probe- So we can log the failure asap. We check right after we set up theadapter->flags, which is when we know that we have a fan.ixgbe_up_complete- To catch failures that may have happened between probe and when we set up the interrupt that would normally detect the fan failure.
Quoted 6 lines
To enable all of this we need to initialize the adapter flag with
IXGBE_FLAG_FAN_FAIL_CAPABLEwhen the NIC contained a fan.Signed-off-by Don Skidmore <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 5/5 ixgbe: Typecase '1' for 64 bit shift
In reply to Jeff KirsherFrom: Nelson, Shannon <[email protected]>
Make sure we don't get any sign-extend issues when we shift a 1 into bit 31.
---
drivers/net/ixgbe/ixgbe_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +3 -3
@@ -1307,7 +1307,7 @@ static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,set_bit (r_idx, q_vector->rxr_idx); q_vector->rxr_count++; - a->rx_ring[r_idx].v_idx =1 << v_idx; + a->rx_ring[r_idx].v_idx = (u64 )1 << v_idx; } static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
@@ -1317,7 +1317,7 @@ static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,set_bit (t_idx, q_vector->txr_idx); q_vector->txr_count++; - a->tx_ring[t_idx].v_idx =1 << v_idx; + a->tx_ring[t_idx].v_idx = (u64 )1 << v_idx; }/**
@@ -4057,7 +4057,7 @@ static void ixgbe_watchdog(unsigned long data)int i;for (i =0 ; i < adapter->num_msix_vectors -NON_Q_VECTORS ; i++) - eics |= (1 << i); + eics |= ((u64 )1 << i);/* Cause software interrupt to ensure rx rings are cleaned */ switch (hw->mac.type) {
Re: [net-next-2.6 PATCH 5/5] ixgbe: Typecase '1' for 64 bit shift
From: Jeff Kirsher <[email protected]>
Date: Thu, 07 May 2009 13:40:15 -0700
Quoted 5 lines
Make sure we don't get any sign-extend issues when we shift a 1 into bit 31.
Signed-off-by Shannon Nelson <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Thu, 07 May 2009 13:38:56 -0700
Quoted 6 lines
As per the documentation for 82599 in order to support hardware RSC the header size must be set. This is only currently done for packet split mode. This patch sets the header buffer length for all modes.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.