i40e/i40evf updates
Subsystems (2)
cover i40e/i40evf updates
Anjali adds a stat to keep track of linearization count.
Carolyn fixes the extra Flow Director filter in the table after an error.
Jesse fixes an erroneous WARN_ON, and moves the interrupt enable to inline.
Matt adds a fix for multiple link up messages in i40e.
Mitch propagates an interrupt allocation failure in the vf, removes an unused opcode in both i40e and i40evf, and adds more verbose error messages to i40e.
Neerav adds additional checks for CEE APP priority validity, adds parsing for CEE DCBX TLVs, and stores the CEE DCBX DesiredCfg and RemoteCfg.
Serey explicitly assign enum index for VSI type in both i40e and i40evf.
Shannon adds a switch for link polling, and saves aq writeback for future inspection.
drivers/net/ethernet/intel/i40e/i40e.h | 25 +- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 271 +++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_dcb.h | 39 +++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 41 +++- drivers/net/ethernet/intel/i40e/i40e_main.c | 48 ++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + drivers/net/ethernet/intel/i40e/i40e_type.h | 21 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 1 - drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 5 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 21 +- drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 1 - drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +- 19 files changed, 421 insertions(+), 80 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/15 i40e/i40evf: Add a stat to keep track of linearization count
From: Anjali Singhai Jain <[email protected]>
Keep track of how many times we ask the stack to linearize the skb because the HW cannot handle skbs with more than 8 frags per segment/single packet.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++++- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +++-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 5 +++-- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + 7 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -477,6 +477,7 @@ struct i40e_vsi {#endif u32 tx_restart;u32 tx_busy; +u64 tx_linearize;u32 rx_buf_failed;u32 rx_page_failed;
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -0
@@ -87,6 +87,7 @@ static const struct i40e_stats i40e_gstrings_misc_stats[] = {I40E_VSI_STAT ("rx_broadcast" , eth_stats.rx_broadcast),I40E_VSI_STAT ("tx_broadcast" , eth_stats.tx_broadcast),I40E_VSI_STAT ("rx_unknown_protocol" , eth_stats.rx_unknown_protocol), + I40E_VSI_STAT("tx_linearize", tx_linearize), }; static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
drivers/net/ethernet/intel/i40e/i40e_main.c +4 -1
@@ -796,6 +796,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)u32 rx_page, rx_buf;u64 bytes, packets;unsigned int start; +u64 tx_linearize;u64 rx_p, rx_b;u64 tx_p, tx_b;u16 q;
@@ -814,7 +815,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)*/ rx_b = rx_p =0 ; tx_b = tx_p =0 ; - tx_restart = tx_busy =0 ; + tx_restart = tx_busy = tx_linearize =0 ; rx_page =0 ; rx_buf =0 ;rcu_read_lock ();
@@ -831,6 +832,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi) tx_p += packets; tx_restart += p->tx_stats.restart_queue; tx_busy += p->tx_stats.tx_busy; + tx_linearize += p->tx_stats.tx_linearize;/* Rx queue is part of the same block as Tx queue */ p = &p[1 ];
@@ -847,6 +849,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)rcu_read_unlock (); vsi->tx_restart = tx_restart; vsi->tx_busy = tx_busy; + vsi->tx_linearize = tx_linearize; vsi->rx_page_failed = rx_page; vsi->rx_buf_failed = rx_buf;
drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -2
@@ -2809,10 +2809,11 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,if (tsyn) tx_flags |=I40E_TX_FLAGS_TSYN ; -if (i40e_chk_linearize (skb, tx_flags)) +if (i40e_chk_linearize (skb, tx_flags)) {if (skb_linearize (skb)) goto out_drop; - + tx_ring->tx_stats.tx_linearize++; + }skb_tx_timestamp (skb);/* always enable CRC insertion offload */
drivers/net/ethernet/intel/i40e/i40e_txrx.h +1 -0
@@ -188,6 +188,7 @@ struct i40e_tx_queue_stats {u64 restart_queue;u64 tx_busy;u64 tx_done_old; +u64 tx_linearize; };struct i40e_rx_queue_stats {
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +3 -2
@@ -2005,10 +2005,11 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,else if (tso) tx_flags |=I40E_TX_FLAGS_TSO ; -if (i40e_chk_linearize (skb, tx_flags)) +if (i40e_chk_linearize (skb, tx_flags)) {if (skb_linearize (skb)) goto out_drop; - + tx_ring->tx_stats.tx_linearize++; + }skb_tx_timestamp (skb);/* always enable CRC insertion offload */
drivers/net/ethernet/intel/i40evf/i40e_txrx.h +1 -0
@@ -187,6 +187,7 @@ struct i40e_tx_queue_stats {u64 restart_queue;u64 tx_busy;u64 tx_done_old; +u64 tx_linearize; };struct i40e_rx_queue_stats {
Signature · 1 line
1.9.3
Bowers
PATCH 1/15 i40e/i40evf: Add a stat to keep track of linearization count
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:42 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 01/15] i40e/i40evf: Add a stat to keep track of linearization countFrom: Anjali Singhai Jain <[email protected]>
Keep track of how many times we ask the stack to linearize the skb because the HW cannot handle skbs with more than 8 frags per segment/single packet.
Signed-off-by Anjali Singhai Jain <[email protected]>Change-ID If455452060963a769bbe6112cba952e79e944b52
Quoted 9 lines
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++++- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +++-- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 5 +++-- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + 7 files changed, 14 insertions(+), 5 deletions(-)
Code changes present in tree
PATCH 2/15 i40e: Additional checks for CEE APP priority validity
In reply to Catherine SullivanFrom: Neerav Parikh <[email protected]>
The firmware has added additional status information to allow software to determine if the APP priority for FCoE/iSCSI/FIP is valid or not in CEE DCBX mode.
This patch adds to support those additional checks and will only add applications to the software table that have oper and sync bits set without any error.
--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 48 ++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 15 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_dcb.c +33 -15
@@ -531,37 +531,55 @@ static void i40e_cee_to_dcb_config( dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en; dcbcfg->pfc.pfccap =I40E_MAX_TRAFFIC_CLASS ; - status = (tlv_status &I40E_AQC_CEE_APP_STATUS_MASK ) >> -I40E_AQC_CEE_APP_STATUS_SHIFT ; + i =0 ; + status = (tlv_status &I40E_AQC_CEE_FCOE_STATUS_MASK ) >> +I40E_AQC_CEE_FCOE_STATUS_SHIFT ; err = (status &I40E_TLV_STATUS_ERR ) ?1 :0 ; sync = (status &I40E_TLV_STATUS_SYNC ) ?1 :0 ; oper = (status &I40E_TLV_STATUS_OPER ) ?1 :0 ; -/* Add APPs if Error is False and Oper/Sync is True */ +/* Add FCoE APP if Error is False and Oper/Sync is True */ if (!err && sync && oper) { -/* CEE operating configuration supports FCoE/iSCSI/FIP only */ - dcbcfg->numapps =I40E_CEE_OPER_MAX_APPS ; -/* FCoE APP */ - dcbcfg->app[0 ].priority = + dcbcfg->app[i].priority = (app_prio &I40E_AQC_CEE_APP_FCOE_MASK ) >>I40E_AQC_CEE_APP_FCOE_SHIFT ; - dcbcfg->app[0 ].selector =I40E_APP_SEL_ETHTYPE ; - dcbcfg->app[0 ].protocolid =I40E_APP_PROTOID_FCOE ; + dcbcfg->app[i].selector =I40E_APP_SEL_ETHTYPE ; + dcbcfg->app[i].protocolid =I40E_APP_PROTOID_FCOE ; + i++; + } + status = (tlv_status &I40E_AQC_CEE_ISCSI_STATUS_MASK ) >> +I40E_AQC_CEE_ISCSI_STATUS_SHIFT ; + err = (status &I40E_TLV_STATUS_ERR ) ?1 :0 ; + sync = (status &I40E_TLV_STATUS_SYNC ) ?1 :0 ; + oper = (status &I40E_TLV_STATUS_OPER ) ?1 :0 ; +/* Add iSCSI APP if Error is False and Oper/Sync is True */ +if (!err && sync && oper) {/* iSCSI APP */ - dcbcfg->app[1 ].priority = + dcbcfg->app[i].priority = (app_prio &I40E_AQC_CEE_APP_ISCSI_MASK ) >>I40E_AQC_CEE_APP_ISCSI_SHIFT ; - dcbcfg->app[1 ].selector =I40E_APP_SEL_TCPIP ; - dcbcfg->app[1 ].protocolid =I40E_APP_PROTOID_ISCSI ; + dcbcfg->app[i].selector =I40E_APP_SEL_TCPIP ; + dcbcfg->app[i].protocolid =I40E_APP_PROTOID_ISCSI ; + i++; + } + status = (tlv_status &I40E_AQC_CEE_FIP_STATUS_MASK ) >> +I40E_AQC_CEE_FIP_STATUS_SHIFT ; + err = (status &I40E_TLV_STATUS_ERR ) ?1 :0 ; + sync = (status &I40E_TLV_STATUS_SYNC ) ?1 :0 ; + oper = (status &I40E_TLV_STATUS_OPER ) ?1 :0 ; +/* Add FIP APP if Error is False and Oper/Sync is True */ +if (!err && sync && oper) {/* FIP APP */ - dcbcfg->app[2 ].priority = + dcbcfg->app[i].priority = (app_prio &I40E_AQC_CEE_APP_FIP_MASK ) >>I40E_AQC_CEE_APP_FIP_SHIFT ; - dcbcfg->app[2 ].selector =I40E_APP_SEL_ETHTYPE ; - dcbcfg->app[2 ].protocolid =I40E_APP_PROTOID_FIP ; + dcbcfg->app[i].selector =I40E_APP_SEL_ETHTYPE ; + dcbcfg->app[i].protocolid =I40E_APP_PROTOID_FIP ; + i++; } + dcbcfg->numapps = i; }/**
Signature · 1 line
1.9.3
Bowers
PATCH 2/15 i40e: Additional checks for CEE APP priority validity
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 02/15] i40e: Additional checks for CEE APP priority validityFrom: Neerav Parikh <[email protected]>
The firmware has added additional status information to allow software to determine if the APP priority for FCoE/iSCSI/FIP is valid or not in CEE DCBX mode.
This patch adds to support those additional checks and will only add applications to the software table that have oper and sync bits set without any error.
Quoted 6 lines
Signed-off-by Neerav Parikh <[email protected]>Change-ID I0a76c52427dadf97d4dba4538a3068d05e4eb56b--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 48 ++++++++++++++++++++-- -------- 1 file changed, 33 insertions(+), 15 deletions(-)
Code changes present in tree
PATCH 3/15 i40evf: propagate interrupt allocation failure
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
Lower level functions are properly reporting errors, and higher-level functions are correctly responding to errors, but the errors aren't actually getting through. Typically, the middle-manager function seems to want to shield its boss from any bad news.
This change fixes a panic if the driver is unable to enable MSI-X or is unable to acquire enough vectors.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -1085,7 +1085,7 @@ static int i40evf_set_interrupt_capability(struct i40evf_adapter *adapter)for (vector =0 ; vector < v_budget; vector++) adapter->msix_entries[vector].entry = vector; -i40evf_acquire_msix_vectors (adapter, v_budget); + err =i40evf_acquire_msix_vectors (adapter, v_budget); out: adapter->netdev->real_num_tx_queues = pairs;
Signature · 1 line
1.9.3
Bowers
PATCH 3/15 i40evf: propagate interrupt allocation failure
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 03/15] i40evf: propagate interrupt allocation failureFrom: Mitch Williams <[email protected]>
Lower level functions are properly reporting errors, and higher-level functions are correctly responding to errors, but the errors aren't actually getting through. Typically, the middle-manager function seems to want to shield its boss from any bad news.
Quoted 8 lines
This change fixes a panic if the driver is unable to enable MSI-X or is unable to acquire enough vectors.
Signed-off-by Mitch Williams <[email protected]>Change-ID Ifd5787ce92519a5d97e4b465902db930d97b71a1--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Code changes present in tree
PATCH 4/15 i40e/i40evf: remove unused opcode
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
This opcode is not required. VFs that program RSS through the firmware do it by interacting directly with the firmware, and do not need to use the virtual channel for this functionality.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 1 - drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 1 - 2 files changed, 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl.h +0 -1
@@ -81,7 +81,6 @@ enum i40e_virtchnl_ops {I40E_VIRTCHNL_OP_GET_STATS =15 ,I40E_VIRTCHNL_OP_FCOE =16 , I40E_VIRTCHNL_OP_EVENT = 17, - I40E_VIRTCHNL_OP_CONFIG_RSS = 18, };/* Virtual channel message descriptor. This overlays the admin queue
drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h +0 -1
@@ -81,7 +81,6 @@ enum i40e_virtchnl_ops {I40E_VIRTCHNL_OP_GET_STATS =15 ,I40E_VIRTCHNL_OP_FCOE =16 , I40E_VIRTCHNL_OP_EVENT = 17, - I40E_VIRTCHNL_OP_CONFIG_RSS = 18, };/* Virtual channel message descriptor. This overlays the admin queue
Signature · 1 line
1.9.3
Bowers
PATCH 4/15 i40e/i40evf: remove unused opcode
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 04/15] i40e/i40evf: remove unused opcodeFrom: Mitch Williams <[email protected]>
This opcode is not required. VFs that program RSS through the firmware do it by interacting directly with the firmware, and do not need to use the virtual channel for this functionality.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID Iaf17d2600e28ff1b6be8653f2fe9df1facd23b0e--- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 1 - drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 1 - 2 files changed, 2 deletions(-)
Code changes present in tree
PATCH 5/15 i40e: fix erroneous WARN_ON
In reply to Catherine SullivanFrom: Jesse Brandeburg <[email protected]>
The driver was issuing a WARN_ON during ring size changes because the code was cloning the rx_ring struct but not zeroing out the pointers before allocating new memory.
Zero out the pointers in the cloned copy before allocating new memory for them. In this case the code was correctly avoiding memory leaks but still triggering the warning.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +10 -0
@@ -1176,6 +1176,11 @@ static int i40e_set_ringparam(struct net_device *netdev,/* clone ring and setup updated count */ tx_rings[i] = *vsi->tx_rings[i]; tx_rings[i].count = new_tx_count; +/* the desc and bi pointers will be reallocated in the +* setup call +*/ + tx_rings[i].desc =NULL ; + tx_rings[i].rx_bi =NULL ; err =i40e_setup_tx_descriptors (&tx_rings[i]);if (err) {while (i) {
@@ -1206,6 +1211,11 @@ static int i40e_set_ringparam(struct net_device *netdev,/* clone ring and setup updated count */ rx_rings[i] = *vsi->rx_rings[i]; rx_rings[i].count = new_rx_count; +/* the desc and bi pointers will be reallocated in the +* setup call +*/ + rx_rings[i].desc =NULL ; + rx_rings[i].rx_bi =NULL ; err =i40e_setup_rx_descriptors (&rx_rings[i]);if (err) {while (i) {
Signature · 1 line
1.9.3
Bowers
PATCH 5/15 i40e: fix erroneous WARN_ON
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 05/15] i40e: fix erroneousWARN_ONFrom: Jesse Brandeburg <[email protected]>
The driver was issuing a
WARN_ONduring ring size changes because the code was cloning therx_ringstruct but not zeroing out the pointers before allocating new memory.Zero out the pointers in the cloned copy before allocating new memory for them. In this case the code was correctly avoiding memory leaks but still triggering the warning.
Quoted 5 lines
Signed-off-by Jesse Brandeburg <[email protected]>Change-ID I186dd493948e9b7254ab0593d4aad8b68808918d--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Code changes present in tree, no WARN_ON when changing ring sizes.
PATCH 6/15 i40e: inline interrupt enable
In reply to Catherine SullivanFrom: Jesse Brandeburg <[email protected]>
The interrupt enable function can be inlined by moving it to the header file, which decreases the function call overhead for a frequently called function.
--- drivers/net/ethernet/intel/i40e/i40e.h | 19 ++++++++++++++++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 ------------------ 2 files changed, 18 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +18 -1
@@ -704,7 +704,24 @@ static inline void i40e_dbg_pf_exit(struct i40e_pf *pf) {}static inline void i40e_dbg_init (void ) {}static inline void i40e_dbg_exit (void ) {}#endif /* CONFIG_DEBUG_FS*/ -void i40e_irq_dynamic_enable (struct i40e_vsi *vsi,int vector); +/** +* i40e_irq_dynamic_enable - Enable default interrupt generation settings +* @vsi: pointer to a vsi +* @vector: enable a particular Hw Interrupt vector, without base_vector +**/ +static inline void i40e_irq_dynamic_enable (struct i40e_vsi *vsi,int vector) +{ +struct i40e_pf *pf = vsi->back; +struct i40e_hw *hw = &pf->hw; +u32 val; + + val =I40E_PFINT_DYN_CTLN_INTENA_MASK | +I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | + (I40E_ITR_NONE <<I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ); +wr32 (hw,I40E_PFINT_DYN_CTLN (vector + vsi->base_vector -1 ), val); +/* skip the flush */ +} +void i40e_irq_dynamic_disable (struct i40e_vsi *vsi,int vector);void i40e_irq_dynamic_disable_icr0 (struct i40e_pf *pf);void i40e_irq_dynamic_enable_icr0 (struct i40e_pf *pf);
drivers/net/ethernet/intel/i40e/i40e_main.c +0 -18
@@ -2953,24 +2953,6 @@ void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf) }/** -* i40e_irq_dynamic_enable - Enable default interrupt generation settings -* @vsi: pointer to a vsi -* @vector: enable a particular Hw Interrupt vector, without base_vector -**/ -void i40e_irq_dynamic_enable (struct i40e_vsi *vsi,int vector) -{ -struct i40e_pf *pf = vsi->back; -struct i40e_hw *hw = &pf->hw; -u32 val; - - val =I40E_PFINT_DYN_CTLN_INTENA_MASK | -I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | - (I40E_ITR_NONE <<I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ); -wr32 (hw,I40E_PFINT_DYN_CTLN (vector + vsi->base_vector -1 ), val); -/* skip the flush */ -} - -/** * i40e_irq_dynamic_disable - Disable default interrupt generation settings * @vsi: pointer to a vsi * @vector: disable a particular Hw Interrupt vector
Signature · 1 line
1.9.3
Bowers
PATCH 6/15 i40e: inline interrupt enable
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 06/15] i40e: inline interrupt enableFrom: Jesse Brandeburg <[email protected]>
The interrupt enable function can be inlined by moving it to the header file, which decreases the function call overhead for a frequently called function.
Quoted 6 lines
Signed-off-by Jesse Brandeburg <[email protected]>Change-ID I3214cc99593725768642680e7b8ce7e9bba7e44d--- drivers/net/ethernet/intel/i40e/i40e.h | 19 ++++++++++++++++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 ------------------ 2 files changed, 18 insertions(+), 19 deletions(-)
Code changes present in tree
PATCH 7/15 i40e: add more verbose error messages
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
Under certain circumstances, the device may not have enough resources to enable all of the VFs that it advertises in config space. Although the number of supported VFs is reported upon driver init, it is not obvious when this is different from the number reported in config space. To eliminate this confusion, add an error message explaining the problem. Additionally, move the 'Allocating VFs' message down below the error checks so as to prevent further confusion.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +3 -1
@@ -998,17 +998,19 @@ static int i40e_pci_sriov_enable(struct pci_dev *pdev, int num_vfs) goto err_out; } -dev_info (&pdev->dev,"Allocating %d VFs.\n" , num_vfs);if (pre_existing_vfs && pre_existing_vfs != num_vfs)i40e_free_vfs (pf);else if (pre_existing_vfs && pre_existing_vfs == num_vfs) goto out;if (num_vfs > pf->num_req_vfs) { +dev_warn (&pdev->dev,"Unable to enable %d VFs. Limited to %d VFs due to device resource constraints.\n" , + num_vfs, pf->num_req_vfs); err = -EPERM ; goto err_out; } +dev_info (&pdev->dev,"Allocating %d VFs.\n" , num_vfs); err =i40e_alloc_vfs (pf, num_vfs);if (err) {dev_warn (&pdev->dev,"Failed to enable SR-IOV: %d\n" , err);
Signature · 1 line
1.9.3
Bowers
PATCH 7/15 i40e: add more verbose error messages
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 07/15] i40e: add more verbose error messagesFrom: Mitch Williams <[email protected]>
Under certain circumstances, the device may not have enough resources to enable all of the VFs that it advertises in config space. Although the number of supported VFs is reported upon driver init, it is not obvious when this is different from the number reported in config space. To eliminate this confusion, add an error message explaining the problem. Additionally, move the 'Allocating VFs' message down below the error checks so as to prevent further confusion.
Quoted 5 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID I45b7efca53a7aebf7777be33a8bc9d615ae48ea1--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Code changes present in tree, behaves as expected per Mitch
PATCH 8/15 i40e: Add parsing for CEE DCBX TLVs
In reply to Catherine SullivanFrom: Neerav Parikh <[email protected]>
This patch adds parsing for CEE DCBX TLVs from the LLDP MIB.
While the driver gets the DCB CEE operational configuration from Firmware using the "Get CEE DCBX Oper Config" AQ command there is a need to get the CEE DesiredCfg Tx by firmware and DCB configuration Rx from peer; for debug and other application purposes.
--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 179 +++++++++++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_dcb.h | 39 +++++++ 2 files changed, 218 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_dcb.c +179 -0
@@ -292,6 +292,182 @@ static void i40e_parse_ieee_tlv(struct i40e_lldp_org_tlv *tlv, }/** +* i40e_parse_cee_pgcfg_tlv +* @tlv: CEE DCBX PG CFG TLV +* @dcbcfg: Local store to update ETS CFG data +* +* Parses CEE DCBX PG CFG TLV +**/ +static void i40e_parse_cee_pgcfg_tlv (struct i40e_cee_feat_tlv *tlv, +struct i40e_dcbx_config *dcbcfg) +{ +struct i40e_dcb_ets_config *etscfg; +u8 *buf = tlv->tlvinfo; +u16 offset =0 ; +u8 priority; +int i; + + etscfg = &dcbcfg->etscfg; + +if (tlv->en_will_err &I40E_CEE_FEAT_TLV_WILLING_MASK ) + etscfg->willing =1 ; + + etscfg->cbs =0 ; +/* Priority Group Table (4 octets) +* Octets:| 1 | 2 | 3 | 4 | +* ----------------------------------------- +* |pri0|pri1|pri2|pri3|pri4|pri5|pri6|pri7| +* ----------------------------------------- +* Bits:|7 4|3 0|7 4|3 0|7 4|3 0|7 4|3 0| +* ----------------------------------------- +*/ +for (i =0 ; i <4 ; i++) { + priority = (u8)((buf[offset] &I40E_CEE_PGID_PRIO_1_MASK ) >> +I40E_CEE_PGID_PRIO_1_SHIFT ); + etscfg->prioritytable[i *2 ] = priority; + priority = (u8)((buf[offset] &I40E_CEE_PGID_PRIO_0_MASK ) >> +I40E_CEE_PGID_PRIO_0_SHIFT ); + etscfg->prioritytable[i *2 +1 ] = priority; + offset++; + } + +/* PG Percentage Table (8 octets) +* Octets:| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | +* --------------------------------- +* |pg0|pg1|pg2|pg3|pg4|pg5|pg6|pg7| +* --------------------------------- +*/ +for (i =0 ; i <I40E_MAX_TRAFFIC_CLASS ; i++) + etscfg->tcbwtable[i] = buf[offset++]; + +/* Number of TCs supported (1 octet) */ + etscfg->maxtcs = buf[offset]; +} + +/** +* i40e_parse_cee_pfccfg_tlv +* @tlv: CEE DCBX PFC CFG TLV +* @dcbcfg: Local store to update PFC CFG data +* +* Parses CEE DCBX PFC CFG TLV +**/ +static void i40e_parse_cee_pfccfg_tlv (struct i40e_cee_feat_tlv *tlv, +struct i40e_dcbx_config *dcbcfg) +{ +u8 *buf = tlv->tlvinfo; + +if (tlv->en_will_err &I40E_CEE_FEAT_TLV_WILLING_MASK ) + dcbcfg->pfc.willing =1 ; + +/* ------------------------ +* | PFC Enable | PFC TCs | +* ------------------------ +* | 1 octet | 1 octet | +*/ + dcbcfg->pfc.pfcenable = buf[0 ]; + dcbcfg->pfc.pfccap = buf[1 ]; +} + +/** +* i40e_parse_cee_app_tlv +* @tlv: CEE DCBX APP TLV +* @dcbcfg: Local store to update APP PRIO data +* +* Parses CEE DCBX APP PRIO TLV +**/ +static void i40e_parse_cee_app_tlv (struct i40e_cee_feat_tlv *tlv, +struct i40e_dcbx_config *dcbcfg) +{ +u16 length, typelength, offset =0 ; +struct i40e_cee_app_prio *app; +u8 i, up; + + typelength =ntohs (tlv->hdr.typelen); + length = (u16)((typelength &I40E_LLDP_TLV_LEN_MASK ) >> +I40E_LLDP_TLV_LEN_SHIFT ); + + dcbcfg->numapps = length /sizeof (*app); +if (!dcbcfg->numapps) +return ; + +for (i =0 ; i < dcbcfg->numapps; i++) { + app = (struct i40e_cee_app_prio *)(tlv->tlvinfo + offset); +for (up =0 ; up <I40E_MAX_USER_PRIORITY ; up++) { +if (app->prio_map & (1 << up)) +break ; + } + dcbcfg->app[i].priority = up; +/* Get Selector from lower 2 bits */ + dcbcfg->app[i].selector = (app->upper_oui_sel & +I40E_CEE_APP_SELECTOR_MASK ); + dcbcfg->app[i].protocolid =ntohs (app->protocol); +/* Move to next app */ + offset +=sizeof (*app); + } +} + +/** +* i40e_parse_cee_tlv +* @tlv: CEE DCBX TLV +* @dcbcfg: Local store to update DCBX config data +* +* Get the TLV subtype and send it to parsing function +* based on the subtype value +**/ +static void i40e_parse_cee_tlv (struct i40e_lldp_org_tlv *tlv, +struct i40e_dcbx_config *dcbcfg) +{ +u16 len, tlvlen, sublen, typelength; +struct i40e_cee_feat_tlv *sub_tlv; +u8 subtype, feat_tlv_count =0 ; +u32 ouisubtype; + + ouisubtype =ntohl (tlv->ouisubtype); + subtype = (u8)((ouisubtype &I40E_LLDP_TLV_SUBTYPE_MASK ) >> +I40E_LLDP_TLV_SUBTYPE_SHIFT ); +/* Return if not CEE DCBX */ +if (subtype !=I40E_CEE_DCBX_TYPE ) +return ; + + typelength =ntohs (tlv->typelength); + tlvlen = (u16)((typelength &I40E_LLDP_TLV_LEN_MASK ) >> +I40E_LLDP_TLV_LEN_SHIFT ); + len =sizeof (tlv->typelength) +sizeof (ouisubtype) + +sizeof (struct i40e_cee_ctrl_tlv ); +/* Return if no CEE DCBX Feature TLVs */ +if (tlvlen <= len) +return ; + + sub_tlv = (struct i40e_cee_feat_tlv *)((char *)tlv + len); +while (feat_tlv_count <I40E_CEE_MAX_FEAT_TYPE ) { + typelength =ntohs (sub_tlv->hdr.typelen); + sublen = (u16)((typelength & +I40E_LLDP_TLV_LEN_MASK ) >> +I40E_LLDP_TLV_LEN_SHIFT ); + subtype = (u8)((typelength &I40E_LLDP_TLV_TYPE_MASK ) >> +I40E_LLDP_TLV_TYPE_SHIFT ); +switch (subtype) { +case I40E_CEE_SUBTYPE_PG_CFG : +i40e_parse_cee_pgcfg_tlv (sub_tlv, dcbcfg); +break ; +case I40E_CEE_SUBTYPE_PFC_CFG : +i40e_parse_cee_pfccfg_tlv (sub_tlv, dcbcfg); +break ; +case I40E_CEE_SUBTYPE_APP_PRI : +i40e_parse_cee_app_tlv (sub_tlv, dcbcfg); +break ; +default : +return ;/* Invalid Sub-type return */ + } + feat_tlv_count++; +/* Move to next sub TLV */ + sub_tlv = (struct i40e_cee_feat_tlv *)((char *)sub_tlv + +sizeof (sub_tlv->hdr.typelen) + + sublen); + } +} + +/** * i40e_parse_org_tlv * @tlv: Organization specific TLV * @dcbcfg: Local store to update ETS REC data
@@ -312,6 +488,9 @@ static void i40e_parse_org_tlv(struct i40e_lldp_org_tlv *tlv,case I40E_IEEE_8021QAZ_OUI :i40e_parse_ieee_tlv (tlv, dcbcfg);break ; +case I40E_CEE_DCBX_OUI : +i40e_parse_cee_tlv (tlv, dcbcfg); +break ;default :break ; }
drivers/net/ethernet/intel/i40e/i40e_dcb.h +39 -0
@@ -44,6 +44,15 @@#define I40E_IEEE_SUBTYPE_PFC_CFG 11#define I40E_IEEE_SUBTYPE_APP_PRI 12 +#define I40E_CEE_DCBX_OUI 0x001b21 +#define I40E_CEE_DCBX_TYPE 2 + +#define I40E_CEE_SUBTYPE_CTRL 1 +#define I40E_CEE_SUBTYPE_PG_CFG 2 +#define I40E_CEE_SUBTYPE_PFC_CFG 3 +#define I40E_CEE_SUBTYPE_APP_PRI 4 + +#define I40E_CEE_MAX_FEAT_TYPE 3/* Defines for LLDP TLV header */ #define I40E_LLDP_TLV_LEN_SHIFT 0#define I40E_LLDP_TLV_LEN_MASK (0x01FF << I40E_LLDP_TLV_LEN_SHIFT)
@@ -98,6 +107,36 @@ struct i40e_lldp_org_tlv {__be32 ouisubtype;u8 tlvinfo[1 ]; }; + +struct i40e_cee_tlv_hdr { +__be16 typelen; +u8 operver; +u8 maxver; +}; + +struct i40e_cee_ctrl_tlv { +struct i40e_cee_tlv_hdr hdr; +__be32 seqno; +__be32 ackno; +}; + +struct i40e_cee_feat_tlv { +struct i40e_cee_tlv_hdr hdr; +u8 en_will_err;/* Bits: |En|Will|Err|Reserved(5)| */ +#define I40E_CEE_FEAT_TLV_ENABLE_MASK 0x80 +#define I40E_CEE_FEAT_TLV_WILLING_MASK 0x40 +#define I40E_CEE_FEAT_TLV_ERR_MASK 0x20 +u8 subtype; +u8 tlvinfo[1 ]; +}; + +struct i40e_cee_app_prio { +__be16 protocol; +u8 upper_oui_sel;/* Bits: |Upper OUI(6)|Selector(2)| */ +#define I40E_CEE_APP_SELECTOR_MASK 0x03 +__be16 lower_oui; +u8 prio_map; +};#pragma pack() i40e_status i40e_get_dcbx_status(struct i40e_hw *hw,
Signature · 1 line
1.9.3
Bowers
PATCH 8/15 i40e: Add parsing for CEE DCBX TLVs
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 08/15] i40e: Add parsing for CEE DCBX TLVsFrom: Neerav Parikh <[email protected]>
This patch adds parsing for CEE DCBX TLVs from the LLDP MIB.
While the driver gets the DCB CEE operational configuration from Firmware using the "Get CEE DCBX Oper Config" AQ command there is a need to get the CEE DesiredCfg Tx by firmware and DCB configuration Rx from peer; for debug and other application purposes.
Quoted 7 lines
Signed-off-by Neerav Parikh <[email protected]>Change-ID I9140edf1a25a2852c7eff805d81e5eff6266178d--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 179 +++++++++++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_dcb.h | 39 +++++++ 2 files changed, 218 insertions(+)
Code changes present in tree
PATCH 9/15 i40e/i40evf: Store CEE DCBX DesiredCfg and RemoteCfg
In reply to Catherine SullivanFrom: Neerav Parikh <[email protected]>
This patch adds capability to query and store the CEE DCBX DesiredCfg and RemoteCfg data from the LLDP MIB.
Added new member "desired_dcbx_config" in the i40e_hw data structure to hold CEE only DesiredCfg data.
--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 44 ++++++++++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +-- drivers/net/ethernet/intel/i40evf/i40e_type.h | 5 +-- 3 files changed, 42 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_dcb.c +36 -8
@@ -762,6 +762,36 @@ static void i40e_cee_to_dcb_config( }/** +* i40e_get_ieee_dcb_config +* @hw: pointer to the hw struct +* +* Get IEEE mode DCB configuration from the Firmware +**/ +static i40e_status i40e_get_ieee_dcb_config (struct i40e_hw *hw) +{ +i40e_status ret =0 ; + +/* IEEE mode */ + hw->local_dcbx_config.dcbx_mode =I40E_DCBX_MODE_IEEE ; +/* Get Local DCB Config */ + ret =i40e_aq_get_dcb_config (hw,I40E_AQ_LLDP_MIB_LOCAL ,0 , + &hw->local_dcbx_config); +if (ret) + goto out; + +/* Get Remote DCB Config */ + ret =i40e_aq_get_dcb_config (hw,I40E_AQ_LLDP_MIB_REMOTE , +I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE , + &hw->remote_dcbx_config); +/* Don't treat ENOENT as an error for Remote MIBs */ +if (hw->aq.asq_last_status ==I40E_AQ_RC_ENOENT ) + ret =0 ; + +out: +return ret; +} + +/** * i40e_get_dcb_config * @hw: pointer to the hw struct *
@@ -776,7 +806,7 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)/* If Firmware version < v4.33 IEEE only */ if (((hw->aq.fw_maj_ver ==4 ) && (hw->aq.fw_min_ver <33 )) || (hw->aq.fw_maj_ver <4 )) - goto ieee; +return i40e_get_ieee_dcb_config (hw);/* If Firmware version == v4.33 use old CEE struct */ if ((hw->aq.fw_maj_ver ==4 ) && (hw->aq.fw_min_ver ==33 )) {
@@ -805,16 +835,14 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)/* CEE mode not enabled try querying IEEE data */ if (hw->aq.asq_last_status ==I40E_AQ_RC_ENOENT ) - goto ieee; -else +return i40e_get_ieee_dcb_config (hw); + +if (ret) goto out; -ieee: -/* IEEE mode */ - hw->local_dcbx_config.dcbx_mode =I40E_DCBX_MODE_IEEE ; -/* Get Local DCB Config */ +/* Get CEE DCB Desired Config */ ret =i40e_aq_get_dcb_config (hw,I40E_AQ_LLDP_MIB_LOCAL ,0 , - &hw->local_dcbx_config); + &hw->desired_dcbx_config);if (ret) goto out;
drivers/net/ethernet/intel/i40e/i40e_type.h +3 -2
@@ -502,8 +502,9 @@ struct i40e_hw {u16 dcbx_status;/* DCBX info */ -struct i40e_dcbx_config local_dcbx_config; -struct i40e_dcbx_config remote_dcbx_config; +struct i40e_dcbx_config local_dcbx_config;/* Oper/Local Cfg */ +struct i40e_dcbx_config remote_dcbx_config;/* Peer Cfg */ +struct i40e_dcbx_config desired_dcbx_config;/* CEE Desired Cfg */ /* debug mask */ u32 debug_mask;
drivers/net/ethernet/intel/i40evf/i40e_type.h +3 -2
@@ -496,8 +496,9 @@ struct i40e_hw {u16 dcbx_status;/* DCBX info */ -struct i40e_dcbx_config local_dcbx_config; -struct i40e_dcbx_config remote_dcbx_config; +struct i40e_dcbx_config local_dcbx_config;/* Oper/Local Cfg */ +struct i40e_dcbx_config remote_dcbx_config;/* Peer Cfg */ +struct i40e_dcbx_config desired_dcbx_config;/* CEE Desired Cfg */ /* debug mask */ u32 debug_mask;
Signature · 1 line
1.9.3
Bowers
PATCH 9/15 i40e/i40evf: Store CEE DCBX DesiredCfg and RemoteCfg
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 09/15] i40e/i40evf: Store CEE DCBX DesiredCfg and RemoteCfgFrom: Neerav Parikh <[email protected]>
This patch adds capability to query and store the CEE DCBX DesiredCfg and RemoteCfg data from the LLDP MIB.
Added new member "desired_dcbx_config" in thei40e_hwdata structure to hold CEE only DesiredCfg data.
Quoted 8 lines
Signed-off-by Neerav Parikh <[email protected]>Change-ID I19c550369594384eaff4cc63e690ca740231195d--- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 44 ++++++++++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +-- drivers/net/ethernet/intel/i40evf/i40e_type.h | 5 +-- 3 files changed, 42 insertions(+), 12 deletions(-)
Code changes present in tree
PATCH 10/15 i40e: Fix for extra Flow Director filter in table after error
In reply to Catherine SullivanFrom: Carolyn Wyborny <[email protected]>
This patch fixes a problem where the pf's fdir filter table would have an entry that the hw was unable to add. This notification happens in the hot path, so instead of trying to fix it then, we note the location in the failure case and delete it during regular fdir subtask callback. Without this patch, a case can occur where an invalid entry gets replayed and a valid one is not.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 14 ++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -412,6 +412,7 @@ struct i40e_pf {u32 npar_min_bw;u32 ioremap_len; +u32 fd_inv; };struct i40e_mac_filter {
drivers/net/ethernet/intel/i40e/i40e_main.c +14 -0
@@ -5404,7 +5404,9 @@ u32 i40e_get_global_fd_count(struct i40e_pf *pf)**/ void i40e_fdir_check_and_reenable (struct i40e_pf *pf) { +struct i40e_fdir_filter *filter;u32 fcnt_prog, fcnt_avail; +struct hlist_node *node;if (test_bit (__I40E_FD_FLUSH_REQUESTED, &pf->state))return ;
@@ -5433,6 +5435,18 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf)dev_info (&pf->pdev->dev,"ATR is being enabled since we have space in the table now\n" ); } } + +/* if hw had a problem adding a filter, delete it */ +if (pf->fd_inv >0 ) { +hlist_for_each_entry_safe (filter, node, + &pf->fdir_filter_list, fdir_node) { +if (filter->fd_id == pf->fd_inv) { +hlist_del (&filter->fdir_node); +kfree (filter); + pf->fdir_pf_active_filters--; + } + } + } }#define I40E_MIN_FD_FLUSH_INTERVAL 10
drivers/net/ethernet/intel/i40e/i40e_txrx.c +2 -1
@@ -465,10 +465,11 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,I40E_RX_PROG_STATUS_DESC_QW1_ERROR_SHIFT ;if (error ==BIT (I40E_RX_PROG_STATUS_DESC_FD_TBL_FULL_SHIFT )) { + pf->fd_inv =le32_to_cpu (rx_desc->wb.qword0.hi_dword.fd_id);if ((rx_desc->wb.qword0.hi_dword.fd_id !=0 ) || (I40E_DEBUG_FD & pf->hw.debug_mask))dev_warn (&pdev->dev,"ntuple filter loc = %d, could not be added\n" , - rx_desc->wb.qword0.hi_dword.fd_id); + pf->fd_inv);/* Check if the programming error is for ATR. * If so, auto disable ATR and set a state for
Signature · 1 line
1.9.3
Bowers
PATCH 10/15 i40e: Fix for extra Flow Director filter in table after error
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 10/15] i40e: Fix for extra Flow Director filter in table after errorFrom: Carolyn Wyborny <[email protected]>
This patch fixes a problem where the pf's fdir filter table would have an entry that the hw was unable to add. This notification happens in the hot path, so instead of trying to fix it then, we note the location in the failure case and delete it during regular fdir subtask callback. Without this patch, a case can occur where an invalid entry gets replayed and a valid one is not.
Quoted 8 lines
Signed-off-by Carolyn Wyborny <[email protected]>Signed-off-by Shannon Nelson <[email protected]>Change-ID I67831c183b5d0309876de807cc434809b74c9cb7--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 14 ++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-)
Code changes present in tree
PATCH 11/15 i40e: Fix multiple link up messages
In reply to Catherine SullivanFrom: Matt Jared <[email protected]>
This patch addresses an issue where multiple link up messages can be logged resulting from aq link status timing when link properties are changed (fc, speed, etc.); solved by using a single function to handle status printing and adding a mechanism to track whether link state (up or down) has actually changed.
--- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +2 -0
@@ -539,6 +539,7 @@ struct i40e_vsi {u16 idx;/* index in pf->vsi[] */ u16 veb_idx;/* index of VEB parent */ struct kobject *kobj;/* sysfs object */ +bool current_isup;/* Sync 'link up' logging */ /* VSI specific handlers */ irqreturn_t (*irq_handler)(int irq,void *data);
@@ -793,4 +794,5 @@ int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);i40e_status i40e_get_npar_bw_setting (struct i40e_pf *pf);i40e_status i40e_set_npar_bw_setting (struct i40e_pf *pf);i40e_status i40e_commit_npar_bw_setting (struct i40e_pf *pf); +void i40e_print_link_message (struct i40e_vsi *vsi,bool isup);#endif /* _I40E_H_ */
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +2 -2
@@ -690,7 +690,7 @@ static int i40e_set_settings(struct net_device *netdev,/* Tell the OS link is going down, the link will go * back up when fw says it is ready asynchronously */ -netdev_info (netdev,"PHY settings change requested, NIC Link is going down.\n" ); +i40e_print_link_message (vsi, false);netif_carrier_off (netdev);netif_tx_stop_all_queues (netdev); }
@@ -834,7 +834,7 @@ static int i40e_set_pauseparam(struct net_device *netdev,/* Tell the OS link is going down, the link will go back up when fw * says it is ready asynchronously */ -netdev_info (netdev,"Flow control settings change requested, NIC Link is going down.\n" ); +i40e_print_link_message (vsi, false);netif_carrier_off (netdev);netif_tx_stop_all_queues (netdev);
drivers/net/ethernet/intel/i40e/i40e_main.c +4 -1
@@ -4627,11 +4627,14 @@ out:* i40e_print_link_message - print link up or down * @vsi: the VSI for which link needs a message */ -static void i40e_print_link_message (struct i40e_vsi *vsi,bool isup) +void i40e_print_link_message (struct i40e_vsi *vsi,bool isup) {char speed[SPEED_SIZE ] ="Unknown" ;char fc[FC_SIZE ] ="RX/TX" ; +if (vsi->current_isup == isup) +return ; + vsi->current_isup = isup;if (!isup) {netdev_info (vsi->netdev,"NIC Link is Down\n" );return ;
Signature · 1 line
1.9.3
Bowers
PATCH 11/15 i40e: Fix multiple link up messages
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Jared, Matthew A
Subject: [Intel-wired-lan] [next PATCH S12 11/15] i40e: Fix multiple link up messagesFrom: Matt Jared <[email protected]>
This patch addresses an issue where multiple link up messages can be logged resulting from aq link status timing when link properties are changed (fc, speed, etc.); solved by using a single function to handle status printing and adding a mechanism to track whether link state (up or down) has actually changed.
Quoted 7 lines
Signed-off-by Matt Jared <[email protected]>Change-ID Ied6ed6e49dc397c77d992adc0bc9ed3767152b9d--- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-)
Code changes present in tree, changing parameters does not result in multiple link up messages.
PATCH 12/15 i40e: add switch for link polling
In reply to Catherine SullivanFrom: Shannon Nelson <[email protected]>
There's been some need for controlling the periodic link polling for debugging link issues. This patch enables switching it off and on through an ethtool private flag. The link poll remains on by default, but can be turned off with
ethtool --set-priv-flags p261p1 LinkPolling off and later turned back on with ethtool --set-priv-flags p261p1 LinkPolling on
To check the current status, use
ethtool --show-priv-flags p261p1
--- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 26 ++++++++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +++- 3 files changed, 29 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +2 -0
@@ -101,6 +101,7 @@/* Ethtool Private Flags */ #define I40E_PRIV_FLAGS_NPAR_FLAG BIT(0) +#define I40E_PRIV_FLAGS_LINKPOLL_FLAG BIT(1)#define I40E_NVM_VERSION_LO_SHIFT 0#define I40E_NVM_VERSION_LO_MASK (0xff << I40E_NVM_VERSION_LO_SHIFT)
@@ -329,6 +330,7 @@ struct i40e_pf {#define I40E_FLAG_WB_ON_ITR_CAPABLE BIT_ULL(35)#define I40E_FLAG_VEB_STATS_ENABLED BIT_ULL(37)#define I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE BIT_ULL(38) +#define I40E_FLAG_LINK_POLLING_ENABLED BIT_ULL(39)#define I40E_FLAG_VEB_MODE_ENABLED BIT_ULL(40)#define I40E_FLAG_GENEVE_OFFLOAD_CAPABLE BIT_ULL(41)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +24 -2
@@ -230,10 +230,10 @@ static const char i40e_gstrings_test[][ETH_GSTRING_LEN] = {static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN ] = {"NPAR" , +"LinkPolling" , }; -#define I40E_PRIV_FLAGS_STR_LEN \ - (sizeof(i40e_priv_flags_strings) / ETH_GSTRING_LEN) +#define I40E_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings)/** * i40e_partition_setting_complaint - generic complaint for MFP restriction
@@ -2636,10 +2636,31 @@ static u32 i40e_get_priv_flags(struct net_device *dev) ret_flags |= pf->hw.func_caps.npar_enable ?I40E_PRIV_FLAGS_NPAR_FLAG :0 ; + ret_flags |= pf->flags &I40E_FLAG_LINK_POLLING_ENABLED ? +I40E_PRIV_FLAGS_LINKPOLL_FLAG :0 ;return ret_flags; } +/** +* i40e_set_priv_flags - set private flags +* @dev: network interface device structure +* @flags: bit flags to be set +**/ +static int i40e_set_priv_flags (struct net_device *dev,u32 flags) +{ +struct i40e_netdev_priv *np =netdev_priv (dev); +struct i40e_vsi *vsi = np->vsi; +struct i40e_pf *pf = vsi->back; + +if (flags &I40E_PRIV_FLAGS_LINKPOLL_FLAG ) + pf->flags |=I40E_FLAG_LINK_POLLING_ENABLED ; +else + pf->flags &= ~I40E_FLAG_LINK_POLLING_ENABLED ; + +return 0 ; +} +static const struct ethtool_ops i40e_ethtool_ops = { .get_settings = i40e_get_settings, .set_settings = i40e_set_settings,
@@ -2676,6 +2697,7 @@ static const struct ethtool_ops i40e_ethtool_ops = { .set_channels = i40e_set_channels, .get_ts_info = i40e_get_ts_info, .get_priv_flags = i40e_get_priv_flags, + .set_priv_flags = i40e_set_priv_flags, };void i40e_set_ethtool_ops (struct net_device *netdev)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -1
@@ -5745,7 +5745,8 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf) pf->service_timer_previous = jiffies;i40e_check_hang_subtask (pf); -i40e_link_event (pf); +if (pf->flags &I40E_FLAG_LINK_POLLING_ENABLED ) +i40e_link_event (pf);/* Update the stats for active netdevs so the network stack * can look at updated numbers whenever it cares to
@@ -7756,6 +7757,7 @@ static int i40e_sw_init(struct i40e_pf *pf)/* Set default capability flags */ pf->flags =I40E_FLAG_RX_CSUM_ENABLED |I40E_FLAG_MSI_ENABLED | +I40E_FLAG_LINK_POLLING_ENABLED |I40E_FLAG_MSIX_ENABLED ;if (iommu_present (&pci_bus_type))
Signature · 1 line
1.9.3
Bowers
PATCH 12/15 i40e: add switch for link polling
Quoted 21 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 12/15] i40e: add switch for link pollingFrom: Shannon Nelson <[email protected]>
There's been some need for controlling the periodic link polling for debugging link issues. This patch enables switching it off and on through an ethtool private flag. The link poll remains on by default, but can be turned off with
ethtool --set-priv-flags p261p1 LinkPolling off and later turned back
on withethtool --set-priv-flags p261p1 LinkPolling onTo check the current status, use
ethtool --show-priv-flags p261p1
Quoted 8 lines
Signed-off-by Shannon Nelson <[email protected]>Change-ID I32e4ab654ff3eec90a06cf144899971b82d71c40--- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 26 ++++++++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +++- 3 files changed, 29 insertions(+), 3 deletions(-)
Code changes present in tree, switch present and functions in ethtool.
PATCH 13/15 i40e/i40evf: Explicitly assign enum index for VSI type
In reply to Catherine SullivanFrom: Serey Kong <[email protected]>
Ran into an issue where PF's VSI type list was different from VF's, which was resulted in different enum index. The VSI type list can be different depending on what build flag is used for PF and VF.
The change is to explicitly assign enum index for each VSI type so that PF and VF always reference to the same VSI type event if the enum lists are different.
--- drivers/net/ethernet/intel/i40e/i40e_type.h | 16 ++++++++-------- drivers/net/ethernet/intel/i40evf/i40e_type.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_type.h +8 -8
@@ -160,14 +160,14 @@ enum i40e_set_fc_aq_failures { };enum i40e_vsi_type { -I40E_VSI_MAIN =0 , -I40E_VSI_VMDQ1 , -I40E_VSI_VMDQ2 , -I40E_VSI_CTRL , -I40E_VSI_FCOE , -I40E_VSI_MIRROR , -I40E_VSI_SRIOV , -I40E_VSI_FDIR , +I40E_VSI_MAIN =0 , +I40E_VSI_VMDQ1 =1 , +I40E_VSI_VMDQ2 =2 , +I40E_VSI_CTRL =3 , +I40E_VSI_FCOE =4 , +I40E_VSI_MIRROR =5 , +I40E_VSI_SRIOV =6 , +I40E_VSI_FDIR =7 ,I40E_VSI_TYPE_UNKNOWN };
drivers/net/ethernet/intel/i40evf/i40e_type.h +8 -8
@@ -160,14 +160,14 @@ enum i40e_set_fc_aq_failures { };enum i40e_vsi_type { -I40E_VSI_MAIN =0 , -I40E_VSI_VMDQ1 , -I40E_VSI_VMDQ2 , -I40E_VSI_CTRL , -I40E_VSI_FCOE , -I40E_VSI_MIRROR , -I40E_VSI_SRIOV , -I40E_VSI_FDIR , +I40E_VSI_MAIN =0 , +I40E_VSI_VMDQ1 =1 , +I40E_VSI_VMDQ2 =2 , +I40E_VSI_CTRL =3 , +I40E_VSI_FCOE =4 , +I40E_VSI_MIRROR =5 , +I40E_VSI_SRIOV =6 , +I40E_VSI_FDIR =7 ,I40E_VSI_TYPE_UNKNOWN };
Signature · 1 line
1.9.3
Bowers
PATCH 13/15 i40e/i40evf: Explicitly assign enum index for VSI type
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Kong, Serey
Subject: [Intel-wired-lan] [next PATCH S12 13/15] i40e/i40evf: Explicitly assign enum index for VSI typeFrom: Serey Kong <[email protected]>
Ran into an issue where PF's VSI type list was different from VF's, which was resulted in different enum index. The VSI type list can be different depending on what build flag is used for PF and VF.
The change is to explicitly assign enum index for each VSI type so that PF and VF always reference to the same VSI type event if the enum lists are different.
Quoted 6 lines
Signed-off-by Serey Kong <[email protected]>Change-ID I8c0e5fdb515f324f7964df863a458073cf467e57--- drivers/net/ethernet/intel/i40e/i40e_type.h | 16 ++++++++-------- drivers/net/ethernet/intel/i40evf/i40e_type.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
Code changes present in tree
PATCH 14/15 i40e/i40evf: save aq writeback for future inspection
In reply to Catherine SullivanFrom: Shannon Nelson <[email protected]>
Add the ability to save the AdminQ write back descriptor if a caller supplies a buffer for it to be saved into.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 ++++ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 ++++ drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 + 4 files changed, 10 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +4 -0
@@ -891,6 +891,10 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, "AQTX: desc and buffer writeback:\n");i40e_debug_aq (hw,I40E_DEBUG_AQ_COMMAND , (void *)desc, buff, buff_size); +/* save writeback aq if requested */ +if (details->wb_desc) + *details->wb_desc = *desc_on_ring; +/* update the error if time out occurred */ if ((!cmd_completed) && (!details->async && !details->postpone)) {
drivers/net/ethernet/intel/i40e/i40e_adminq.h +1 -0
@@ -69,6 +69,7 @@ struct i40e_asq_cmd_details {u16 flags_dis;bool async;bool postpone; +struct i40e_aq_desc *wb_desc; };#define I40E_ADMINQ_DETAILS (R , i) \
drivers/net/ethernet/intel/i40evf/i40e_adminq.c +4 -0
@@ -832,6 +832,10 @@ i40e_status i40evf_asq_send_command(struct i40e_hw *hw,i40evf_debug_aq (hw,I40E_DEBUG_AQ_COMMAND , (void *)desc, buff, buff_size); +/* save writeback aq if requested */ +if (details->wb_desc) + *details->wb_desc = *desc_on_ring; +/* update the error if time out occurred */ if ((!cmd_completed) && (!details->async && !details->postpone)) {
drivers/net/ethernet/intel/i40evf/i40e_adminq.h +1 -0
@@ -69,6 +69,7 @@ struct i40e_asq_cmd_details {u16 flags_dis;bool async;bool postpone; +struct i40e_aq_desc *wb_desc; };#define I40E_ADMINQ_DETAILS (R , i) \
Signature · 1 line
1.9.3
Bowers
PATCH 14/15 i40e/i40evf: save aq writeback for future inspection
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 14/15] i40e/i40evf: save aq writeback for future inspectionFrom: Shannon Nelson <[email protected]>
Add the ability to save the AdminQ write back descriptor if a caller supplies a buffer for it to be saved into.
Quoted 8 lines
Signed-off-by Shannon Nelson <[email protected]>Change-ID I3d1301d26360b39a2d66dc8569e851f54133a3af--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 ++++ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 ++++ drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 + 4 files changed, 10 insertions(+)
Code changes present in tree, admin queue data written and read correctly.
PATCH 15/15 i40e/i40evf: Bump i40e version to 1.3.18 and i40evf version to 1.3.10
In reply to Catherine SullivanBump.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -40,7 +40,7 @@ static const char i40e_driver_string[] =#define DRV_VERSION_MAJOR 1#define DRV_VERSION_MINOR 3 -#define DRV_VERSION_BUILD 14 +#define DRV_VERSION_BUILD 18#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ __stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_BUILD) DRV_KERN
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -35,7 +35,7 @@ char i40evf_driver_name[] = "i40evf";static const char i40evf_driver_string[] ="Intel(R) XL710/X710 Virtual Function Network Driver" ; -#define DRV_VERSION "1.3.8" +#define DRV_VERSION "1.3.10"const char i40evf_driver_version[] =DRV_VERSION ;static const char i40evf_copyright[] ="Copyright (c) 2013 - 2015 Intel Corporation." ;
Signature · 1 line
1.9.3
Bowers
PATCH 15/15 i40e/i40evf: Bump i40e version to 1.3.18 and i40evf version to 1.3.10
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Thursday, August 27, 2015 8:43 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S12 15/15] i40e/i40evf: Bump i40e version to 1.3.18 and i40evf version to 1.3.10
Quoted 8 lines
Bump.
Signed-off-by Catherine Sullivan <[email protected]>Change-ID Ib367558d3f44979e4677f6d6a15719bcafc86dc0--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Code changes present in tree, 'modinfo i40e' and 'modinfo i40evf' show correct version.