ixgbe: fix sfp_timer clean up in ixgbe_down
Subsystems (2)
PATCH 1/3 ixgbe: fix sfp_timer clean up in ixgbe_down
From: Don Skidmore <[email protected]>
We weren't stoping the sfp_timer after the device was brought down. This patch properly cleans up.
---
drivers/net/ixgbe/ixgbe_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +2 -0
@@ -2926,6 +2926,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)ixgbe_napi_disable_all (adapter); +clear_bit (__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state); +del_timer_sync (&adapter->sfp_timer);del_timer_sync (&adapter->watchdog_timer);cancel_work_sync (&adapter->watchdog_task);
PATCH 2/3 ixgbe: Allow tx itr specific settings
From: Nelson, Shannon <[email protected]>
Allow the user to set Tx specific itr values. This only makes sense when there are separate vectors for Tx and Rx. When the queues are doubled up RxTx on the vectors, we still only use the rx itr value.
---
drivers/net/ixgbe/ixgbe.h | 6 ++- drivers/net/ixgbe/ixgbe_ethtool.c | 75 ++++++++++++++++++++++++++++++------- drivers/net/ixgbe/ixgbe_main.c | 31 +++++++++------ 3 files changed, 83 insertions(+), 29 deletions(-)
drivers/net/ixgbe/ixgbe.h +4 -2
@@ -267,7 +267,8 @@ struct ixgbe_adapter {enum ixgbe_fc_mode last_lfc_mode;/* Interrupt Throttle Rate */ -u32 itr_setting; +u32 rx_itr_setting; +u32 tx_itr_setting;u16 eitr_low;u16 eitr_high;
@@ -351,7 +352,8 @@ struct ixgbe_adapter {struct ixgbe_hw_stats stats;/* Interrupt Throttle Rate */ -u32 eitr_param; +u32 rx_eitr_param; +u32 tx_eitr_param;unsigned long state;u64 tx_busy;
drivers/net/ixgbe/ixgbe_ethtool.c +61 -14
126 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_main.c +18 -13
@@ -926,12 +926,12 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter) r_idx + 1); } -/* if this is a tx only vector halve the interrupt rate */ if (q_vector->txr_count && !q_vector->rxr_count) - q_vector->eitr = (adapter->eitr_param >>1 ); +/* tx only */ + q_vector->eitr = adapter->tx_eitr_param;else if (q_vector->rxr_count) -/* rx only */ - q_vector->eitr = adapter->eitr_param; +/* rx or mixed */ + q_vector->eitr = adapter->rx_eitr_param;ixgbe_write_eitr (q_vector); }
@@ -1359,7 +1359,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)/* If all Rx work done, exit the polling mode */ if (work_done < budget) {napi_complete (napi); -if (adapter->itr_setting &1 ) +if (adapter->rx_itr_setting &1 )ixgbe_set_itr_msix (q_vector);if (!test_bit (__IXGBE_DOWN, &adapter->state)) ixgbe_irq_enable_queues(adapter,
@@ -1420,7 +1420,7 @@ static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)/* If all Rx work done, exit the polling mode */ if (work_done < budget) {napi_complete (napi); -if (adapter->itr_setting &1 ) +if (adapter->rx_itr_setting &1 )ixgbe_set_itr_msix (q_vector);if (!test_bit (__IXGBE_DOWN, &adapter->state)) ixgbe_irq_enable_queues(adapter,
@@ -1458,10 +1458,10 @@ static int ixgbe_clean_txonly(struct napi_struct *napi, int budget)if (!ixgbe_clean_tx_irq (q_vector, tx_ring)) work_done = budget; -/* If all Rx work done, exit the polling mode */ +/* If all Tx work done, exit the polling mode */ if (work_done < budget) {napi_complete (napi); -if (adapter->itr_setting &1 ) +if (adapter->tx_itr_setting &1 )ixgbe_set_itr_msix (q_vector);if (!test_bit (__IXGBE_DOWN, &adapter->state))ixgbe_irq_enable_queues (adapter, ((u64 )1 << q_vector->v_idx));
@@ -1848,7 +1848,7 @@ static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;IXGBE_WRITE_REG (hw,IXGBE_EITR (0 ), -EITR_INTS_PER_SEC_TO_REG (adapter->eitr_param)); +EITR_INTS_PER_SEC_TO_REG (adapter->rx_eitr_param));ixgbe_set_ivar (adapter,0 ,0 ,0 );ixgbe_set_ivar (adapter,1 ,0 ,0 );
@@ -2991,7 +2991,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)/* If budget not fully consumed, exit the polling mode */ if (work_done < budget) {napi_complete (napi); -if (adapter->itr_setting &1 ) +if (adapter->rx_itr_setting &1 )ixgbe_set_itr (adapter);if (!test_bit (__IXGBE_DOWN, &adapter->state))ixgbe_irq_enable_queues (adapter,IXGBE_EIMS_RTX_QUEUE );
@@ -3601,7 +3601,10 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)if (!q_vector) goto err_out; q_vector->adapter = adapter; - q_vector->eitr = adapter->eitr_param; +if (q_vector->txr_count && !q_vector->rxr_count) + q_vector->eitr = adapter->tx_eitr_param; +else + q_vector->eitr = adapter->rx_eitr_param; q_vector->v_idx = q_idx;netif_napi_add (adapter->netdev, &q_vector->napi, (*poll),64 ); adapter->q_vector[q_idx] = q_vector;
@@ -3870,8 +3873,10 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) hw->fc.disable_fc_autoneg = false;/* enable itr by default in dynamic mode */ - adapter->itr_setting =1 ; - adapter->eitr_param =20000 ; + adapter->rx_itr_setting =1 ; + adapter->rx_eitr_param =20000 ; + adapter->tx_itr_setting =1 ; + adapter->tx_eitr_param =10000 ;/* set defaults for eitr in MegaBytes */ adapter->eitr_low =10 ;
Re: [net-2.6 PATCH 2/3] ixgbe: Allow tx itr specific settings
From: Jeff Kirsher <[email protected]>
Date: Fri, 18 Sep 2009 12:46:06 -0700
Quoted 9 lines
From: Nelson, Shannon <[email protected]>
Allow the user to set Tx specific itr values. This only makes sense when there are separate vectors for Tx and Rx. When the queues are doubled up RxTx on the vectors, we still only use the rx itr value.
Signed-off-by Shannon Nelson <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/3 ixgbe: move rx queue RSC configuration to a separate function
In reply to Jeff KirsherFrom: Nelson, Shannon <[email protected]>
Shorten ixgbe_configure_rx() and lessen indent depth.
---
drivers/net/ixgbe/ixgbe_main.c | 78 ++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 31 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +47 -31
@@ -1970,6 +1970,50 @@ static u32 ixgbe_setup_mrqc(struct ixgbe_adapter *adapter) }/** +* ixgbe_configure_rscctl - enable RSC for the indicated ring +* @adapter: address of board private structure +* @index: index of ring to set +* @rx_buf_len: rx buffer length +**/ +static void ixgbe_configure_rscctl (struct ixgbe_adapter *adapter,int index, +int rx_buf_len) +{ +struct ixgbe_ring *rx_ring; +struct ixgbe_hw *hw = &adapter->hw; +int j; +u32 rscctrl; + + rx_ring = &adapter->rx_ring[index]; + j = rx_ring->reg_idx; + rscctrl =IXGBE_READ_REG (hw,IXGBE_RSCCTL (j)); + rscctrl |=IXGBE_RSCCTL_RSCEN ; +/* +* we must limit the number of descriptors so that the +* total size of max desc * buf_len is not greater +* than 65535 +*/ +if (rx_ring->flags &IXGBE_RING_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_1 ; +#endif + }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); +} + +/** * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset * @adapter: board private structure *
@@ -1990,7 +2034,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)u32 fctrl, hlreg0;u32 reta =0 , mrqc =0 ;u32 rdrxctl; -u32 rscctrl;int rx_buf_len;/* Decide whether to use packet split mode or not */
@@ -2148,36 +2191,9 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)if (adapter->flags2 &IXGBE_FLAG2_RSC_ENABLED ) {/* Enable 82599 HW-RSC */ -for (i =0 ; i < adapter->num_rx_queues; i++) { - rx_ring = &adapter->rx_ring[i]; - j = rx_ring->reg_idx; - rscctrl =IXGBE_READ_REG (hw,IXGBE_RSCCTL (j)); - rscctrl |=IXGBE_RSCCTL_RSCEN ; -/* -* we must limit the number of descriptors so that the -* total size of max desc * buf_len is not greater -* than 65535 -*/ -if (rx_ring->flags &IXGBE_RING_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_1 ; -#endif - }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); - } +for (i =0 ; i < adapter->num_rx_queues; i++) +ixgbe_configure_rscctl (adapter, i, rx_buf_len); +/* Disable RSC for ACK packets */ IXGBE_WRITE_REG (hw,IXGBE_RSCDBU , (IXGBE_RSCDBU_RSCACKDIS |IXGBE_READ_REG (hw,IXGBE_RSCDBU )));
Re: [net-2.6 PATCH 3/3] ixgbe: move rx queue RSC configuration to a separate function
From: Jeff Kirsher <[email protected]>
Date: Fri, 18 Sep 2009 12:46:27 -0700
Quoted 8 lines
From: Nelson, Shannon <[email protected]>
Shorten
ixgbe_configure_rx()and lessen indent depth.Signed-off-by Shannon Nelson <[email protected]>Signed-off-by Don Skidmore <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Fri, 18 Sep 2009 12:45:43 -0700
Quoted 9 lines
From: Don Skidmore <[email protected]>
We weren't stoping the
sfp_timerafter the device was brought down. This patch properly cleans up.Signed-off-by Shannon Nelson <[email protected]>Signed-off-by Don Skidmore <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.