i40e: Move i40e_get_head into header file
Subsystems (2)
PATCH 1/2 i40e: Move i40e_get_head into header file
From: Kiran Patil <[email protected]>
i40e_get_head needs to be called in multiple files in a further patch, prepare by moving the function into a header file.
--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 ------------- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -13
@@ -601,19 +601,6 @@ void i40e_free_tx_resources(struct i40e_ring *tx_ring) } } -/** -* i40e_get_head - Retrieve head from head writeback -* @tx_ring: tx ring to fetch head of -* -* Returns value of Tx ring head based on value stored -* in head write-back location -**/ -static inline u32 i40e_get_head (struct i40e_ring *tx_ring) -{ -void *head = (struct i40e_tx_desc *)tx_ring->desc + tx_ring->count; - -return le32_to_cpu (*(volatile __le32 *)head); -}/** * i40e_get_tx_pending - how many tx descriptors not processed
drivers/net/ethernet/intel/i40e/i40e_txrx.h +14 -0
@@ -328,4 +328,18 @@ int i40e_xmit_descriptor_count(struct sk_buff *skb, struct i40e_ring *tx_ring);int i40e_tx_prepare_vlan_flags (struct sk_buff *skb,struct i40e_ring *tx_ring,u32 *flags);#endif + +/** +* i40e_get_head - Retrieve head from head writeback +* @tx_ring: tx ring to fetch head of +* +* Returns value of Tx ring head based on value stored +* in head write-back location +**/ +static inline u32 i40e_get_head (struct i40e_ring *tx_ring) +{ +void *head = (struct i40e_tx_desc *)tx_ring->desc + tx_ring->count; + +return le32_to_cpu (*(volatile __le32 *)head); +}#endif /* _I40E_TXRX_H_ */
Signature · 1 line
1.9.3
PATCH 2/2 i40e/i40evf: refactor tx timeout logic
This patch modifies the driver timeout logic by issuing a writeback request via a software interrupt to the hardware the first time the driver detects a hang. The driver was too agrressive in resetting a hung queue, so back that off by removing logic to down the netdevice after too many hangs, and move the function to the service task.
---
HSD-number: 5644407,5644501,5644189,5644320,5644525,5644616,5645042
drivers/net/ethernet/intel/i40e/i40e.h | 1 - drivers/net/ethernet/intel/i40e/i40e_main.c | 274 +++++++++++++++----------- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 75 +------ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 10 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 96 +-------- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 8 - 6 files changed, 173 insertions(+), 291 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +0 -1
@@ -246,7 +246,6 @@ struct i40e_pf {struct pci_dev *pdev;struct i40e_hw hw;unsigned long state; -unsigned long link_check_timeout;struct msix_entry *msix_entries;bool fc_autoneg_status;
drivers/net/ethernet/intel/i40e/i40e_main.c +161 -113
355 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_txrx.c +2 -73
105 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_txrx.h +2 -8
@@ -201,8 +201,6 @@ struct i40e_rx_queue_stats {enum i40e_ring_state_t { __I40E_TX_FDIR_INIT_DONE, __I40E_TX_XPS_INIT_DONE, - __I40E_TX_DETECT_HANG, - __I40E_HANG_CHECK_ARMED, __I40E_RX_PS_ENABLED, __I40E_RX_16BYTE_DESC_ENABLED, };
@@ -213,12 +211,6 @@ enum i40e_ring_state_t { set_bit(__I40E_RX_PS_ENABLED, &(ring)->state)#define clear_ring_ps_enabled (ring) \ clear_bit(__I40E_RX_PS_ENABLED, &(ring)->state) -#define check_for_tx_hang (ring) \ - test_bit(__I40E_TX_DETECT_HANG, &(ring)->state) -#define set_check_for_tx_hang (ring) \ - set_bit(__I40E_TX_DETECT_HANG, &(ring)->state) -#define clear_check_for_tx_hang (ring) \ - clear_bit(__I40E_TX_DETECT_HANG, &(ring)->state)#define ring_is_16byte_desc_enabled (ring) \ test_bit(__I40E_RX_16BYTE_DESC_ENABLED, &(ring)->state)#define set_ring_16byte_desc_enabled (ring) \
@@ -328,6 +320,8 @@ int i40e_xmit_descriptor_count(struct sk_buff *skb, struct i40e_ring *tx_ring);int i40e_tx_prepare_vlan_flags (struct sk_buff *skb,struct i40e_ring *tx_ring,u32 *flags);#endif +void i40e_force_wb (struct i40e_vsi *vsi,struct i40e_q_vector *q_vector); +u32 i40e_get_tx_pending (struct i40e_ring *ring);/** * i40e_get_head - Retrieve head from head writeback
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +8 -88
133 lines not on this page · raw message
drivers/net/ethernet/intel/i40evf/i40e_txrx.h +0 -8
@@ -200,8 +200,6 @@ struct i40e_rx_queue_stats {enum i40e_ring_state_t { __I40E_TX_FDIR_INIT_DONE, __I40E_TX_XPS_INIT_DONE, - __I40E_TX_DETECT_HANG, - __I40E_HANG_CHECK_ARMED, __I40E_RX_PS_ENABLED, __I40E_RX_16BYTE_DESC_ENABLED, };
@@ -212,12 +210,6 @@ enum i40e_ring_state_t { set_bit(__I40E_RX_PS_ENABLED, &(ring)->state)#define clear_ring_ps_enabled (ring) \ clear_bit(__I40E_RX_PS_ENABLED, &(ring)->state) -#define check_for_tx_hang (ring) \ - test_bit(__I40E_TX_DETECT_HANG, &(ring)->state) -#define set_check_for_tx_hang (ring) \ - set_bit(__I40E_TX_DETECT_HANG, &(ring)->state) -#define clear_check_for_tx_hang (ring) \ - clear_bit(__I40E_TX_DETECT_HANG, &(ring)->state)#define ring_is_16byte_desc_enabled (ring) \ test_bit(__I40E_RX_16BYTE_DESC_ENABLED, &(ring)->state)#define set_ring_16byte_desc_enabled (ring) \
Signature · 1 line
1.9.3
Sullivan
PATCH 2/2 i40e/i40evf: refactor tx timeout logic
See v2 with the correct author.
Bowers
PATCH 1/2 i40e: Move i40e_get_head into header file
In reply to Catherine SullivanQuoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, September 24, 2015 12:43 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH 1/2] i40e: Movei40e_get_headinto header fileFrom: Kiran Patil <[email protected]>
Quoted 8 lines
i40e_get_headneeds to be called in multiple files in a further patch, prepare by moving the function into a header file.Signed-off-by Kiran Patil <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 ------------- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-)
Code changes present in tree