iavf: Enable support for up to 16 queues
Subsystems (2)
Tony Nguyen
maintainerPATCH 1/15 iavf: Enable support for up to 16 queues
From: Mitch Williams <[email protected]>
Previous devices could only allocate 4 MSI-X vectors per VF so there was a limitation of 4 queues. 800-series hardware can allocate more than 4 MSI-X vectors, so expand the limitation on the number of queues that the driver can support to account for these capabilities.
Fix eththool channel operations to accommodate this change and adjust the reporting of max number of queues to what is given to us by the PF. Since we're not requesting queues above this value, just trigger reset to activate the queues, which we already own.
Finally, fix a test condition that would display an incorrect error message.
--- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 20 +++++++------- drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 27 ------------------- 4 files changed, 11 insertions(+), 40 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +1 -1
@@ -81,7 +81,7 @@ struct iavf_vsi {#define IAVF_TX_DESC (R , i) (&(((struct iavf_tx_desc *)((R)->desc))[i]))#define IAVF_TX_CTXTDESC (R , i) \ (&(((struct iavf_tx_context_desc *)((R)->desc))[i])) -#define IAVF_MAX_REQ_QUEUES 4 +#define IAVF_MAX_REQ_QUEUES 16#define IAVF_HKEY_ARRAY_SIZE ((IAVF_VFQF_HKEY_MAX_INDEX + 1) * 4)#define IAVF_HLUT_ARRAY_SIZE ((IAVF_VFQF_HLUT_MAX_INDEX + 1) * 4)
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +9 -11
@@ -860,7 +860,7 @@ static void iavf_get_channels(struct net_device *netdev,struct iavf_adapter *adapter =netdev_priv (netdev);/* Report maximum channels */ - ch->max_combined =IAVF_MAX_REQ_QUEUES ; + ch->max_combined = adapter->vsi_res->num_queue_pairs; ch->max_other =NONQ_VECS ; ch->other_count =NONQ_VECS ;
@@ -881,14 +881,7 @@ static int iavf_set_channels(struct net_device *netdev, struct ethtool_channels *ch) {struct iavf_adapter *adapter =netdev_priv (netdev); -int num_req = ch->combined_count; - -if (num_req != adapter->num_active_queues && - !(adapter->vf_res->vf_cap_flags & -VIRTCHNL_VF_OFFLOAD_REQ_QUEUES )) { -dev_info (&adapter->pdev->dev,"PF is not capable of queue negotiation.\n" ); -return -EINVAL ; - } +u32 num_req = ch->combined_count;if ((adapter->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADQ ) && adapter->num_tc) {
@@ -899,14 +892,19 @@ static int iavf_set_channels(struct net_device *netdev,/* All of these should have already been checked by ethtool before this * even gets to us, but just to be sure. */ -if (num_req <=0 || num_req >IAVF_MAX_REQ_QUEUES ) +if (num_req > adapter->vsi_res->num_queue_pairs)return -EINVAL ; +if (num_req == adapter->num_active_queues) +return 0 ; +if (ch->rx_count || ch->tx_count || ch->other_count !=NONQ_VECS )return -EINVAL ; adapter->num_req_queues = num_req; -return iavf_request_queues (adapter, num_req); + adapter->flags |=IAVF_FLAG_REINIT_ITR_NEEDED ; +iavf_schedule_reset (adapter); +return 0 ; }/**
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -1
@@ -3448,7 +3448,7 @@ int iavf_process_config(struct iavf_adapter *adapter) }if (num_req_queues && - num_req_queues != adapter->vsi_res->num_queue_pairs) { + num_req_queues > adapter->vsi_res->num_queue_pairs) {/* Problem. The PF gave us fewer queues than what we had * negotiated in our request. Need a reset to see if we can't * get back to a working state.
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +0 -27
@@ -396,33 +396,6 @@ void iavf_map_queues(struct iavf_adapter *adapter)kfree (vimi); } -/** -* iavf_request_queues -* @adapter: adapter structure -* @num: number of requested queues -* -* We get a default number of queues from the PF. This enables us to request a -* different number. Returns 0 on success, negative on failure -**/ -int iavf_request_queues (struct iavf_adapter *adapter,int num) -{ -struct virtchnl_vf_res_request vfres; - -if (adapter->current_op !=VIRTCHNL_OP_UNKNOWN ) { -/* bail because we already have a command pending */ -dev_err (&adapter->pdev->dev,"Cannot request queues, command %d pending\n" , - adapter->current_op); -return -EBUSY ; - } - - vfres.num_queue_pairs =min_t (int, num,num_online_cpus ()); - - adapter->current_op =VIRTCHNL_OP_REQUEST_QUEUES ; - adapter->flags |=IAVF_FLAG_REINIT_ITR_NEEDED ; -return iavf_send_pf_msg (adapter,VIRTCHNL_OP_REQUEST_QUEUES , - (u8 *)&vfres,sizeof (vfres)); -} -/** * iavf_add_ether_addrs * @adapter: adapter structure
Signature · 1 line
2.20.1
Tony Nguyen
maintainerPATCH 2/15 ice: allow bigger VFs
From: Mitch Williams <[email protected]>
Unlike the XL710 series, 800-series hardware can allocate more than 4 MSI-X vectors per VF. This patch enables that functionality. We dynamically allocate vectors and queues depending on how many VFs are enabled. Allocating the maximum number of VFs replicates XL710 behavior with 4 queues and 4 vectors. But allocating a smaller number of VFs will give you 16 queues and 16 vectors.
--- drivers/net/ethernet/intel/ice/ice.h | 1 - drivers/net/ethernet/intel/ice/ice_lib.c | 9 +- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 279 +++++++++--------- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 15 +- 4 files changed, 146 insertions(+), 158 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +0 -1
@@ -72,7 +72,6 @@ extern const char ice_drv_ver[];#define ICE_Q_WAIT_RETRY_LIMIT 10#define ICE_Q_WAIT_MAX_RETRY (5 * ICE_Q_WAIT_RETRY_LIMIT)#define ICE_MAX_LG_RSS_QS 256 -#define ICE_MAX_SMALL_RSS_QS 8#define ICE_RES_VALID_BIT 0x8000#define ICE_RES_MISC_VEC_ID (ICE_RES_VALID_BIT - 1)#define ICE_RDMA_NUM_VECS 4
drivers/net/ethernet/intel/ice/ice_lib.c +4 -5
@@ -582,12 +582,11 @@ static void ice_vsi_set_rss_params(struct ice_vsi *vsi) vsi->rss_lut_type =ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF ;break ;case ICE_VSI_VF : -/* VF VSI will gets a small RSS table -* For VSI_LUT, LUT size should be set to 64 bytes +/* VF VSI will get a small RSS table. +* For VSI_LUT, LUT size should be set to 64 bytes. */ vsi->rss_table_size =ICE_VSIQF_HLUT_ARRAY_SIZE ; - vsi->rss_size =min_t (int,num_online_cpus (), -BIT (cap->rss_table_entry_width)); + vsi->rss_size =ICE_MAX_RSS_QS_PER_VF ; vsi->rss_lut_type =ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_VSI ;break ;case ICE_VSI_LB :
@@ -695,7 +694,7 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)if (vsi->type ==ICE_VSI_PF ) max_rss =ICE_MAX_LG_RSS_QS ;else - max_rss =ICE_MAX_SMALL_RSS_QS ; + max_rss =ICE_MAX_RSS_QS_PER_VF ; qcount_rx =min_t (int, rx_numq_tc, max_rss);if (!vsi->req_rxq) qcount_rx = min_t(int, qcount_rx,
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +136 -143
461 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h +6 -9
@@ -21,18 +21,15 @@#define ICE_PCI_CIAD_WAIT_COUNT 100#define ICE_PCI_CIAD_WAIT_DELAY_US 1 -/* VF resources default values and limitation */ +/* VF resource constraints */ #define ICE_MAX_VF_COUNT 256 -#define ICE_MAX_QS_PER_VF 256#define ICE_MIN_QS_PER_VF 1 -#define ICE_DFLT_QS_PER_VF 4#define ICE_NONQ_VECS_VF 1#define ICE_MAX_SCATTER_QS_PER_VF 16 -#define ICE_MAX_BASE_QS_PER_VF 16 -#define ICE_MAX_INTR_PER_VF 65 -#define ICE_MAX_POLICY_INTR_PER_VF 33 +#define ICE_MAX_RSS_QS_PER_VF 16 +#define ICE_NUM_VF_MSIX_MED 17 +#define ICE_NUM_VF_MSIX_SMALL 5#define ICE_MIN_INTR_PER_VF (ICE_MIN_QS_PER_VF + 1) -#define ICE_DFLT_INTR_PER_VF (ICE_DFLT_QS_PER_VF + 1)#define ICE_MAX_VF_RESET_TRIES 40#define ICE_MAX_VF_RESET_SLEEP_MS 20
@@ -75,8 +72,8 @@ struct ice_vf {struct virtchnl_version_info vf_ver;u32 driver_caps;/* reported by VF driver */ struct virtchnl_ether_addr dflt_lan_addr; -DECLARE_BITMAP (txq_ena,ICE_MAX_BASE_QS_PER_VF ); -DECLARE_BITMAP (rxq_ena,ICE_MAX_BASE_QS_PER_VF ); +DECLARE_BITMAP (txq_ena,ICE_MAX_RSS_QS_PER_VF ); +DECLARE_BITMAP (rxq_ena,ICE_MAX_RSS_QS_PER_VF );u16 port_vlan_info;/* Port VLAN ID and QoS */ u8 pf_set_mac:1; /* VF MAC address set by VMM admin */ u8 trusted:1;
Signature · 1 line
2.20.1
Bowers
PATCH 2/15 ice: allow bigger VFs
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 02/15] ice: allow bigger VFsFrom: Mitch Williams <[email protected]>
Unlike the XL710 series, 800-series hardware can allocate more than 4 MSI-X vectors per VF. This patch enables that functionality. We dynamically allocate vectors and queues depending on how many VFs are enabled. Allocating the maximum number of VFs replicates XL710 behavior with 4 queues and 4 vectors. But allocating a smaller number of VFs will give you 16 queues and 16 vectors.
Signed-off-by Mitch Williams <[email protected]>Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>
Quoted 6 lines
--- drivers/net/ethernet/intel/ice/ice.h | 1 - drivers/net/ethernet/intel/ice/ice_lib.c | 9 +- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 279 +++++++++--------- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 15 +- 4 files changed, 146 insertions(+), 158 deletions(-)
Tony Nguyen
maintainerPATCH 3/15 ice: Improve clarity of prints and variables
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently when the device runs out of MSI-X interrupts a cryptic and unhelpful message is printed. This will cause confusion when hitting this case. Fix this by clearing up the error message for both SR-IOV and non SR-IOV use cases.
Also, make a few minor changes to increase clarity of variables.
1. Change per VF MSI-X and queue pair variables in the PF structure.
2. Use ICE_NONQ_VECS_VF when determining pf->num_msix_per_vf instead of the magic number "1". This vector is reserved for the OICR.
All of the resource tracking functions were moved to avoid adding any forward declaration function prototypes.
--- drivers/net/ethernet/intel/ice/ice.h | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 200 ++++++++++-------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 66 +++--- 3 files changed, 145 insertions(+), 125 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +2 -2
@@ -369,8 +369,8 @@ struct ice_pf {struct ice_vf *vf;int num_alloc_vfs;/* actual number of VFs allocated */ u16 num_vfs_supported;/* num VFs supported for this PF */ -u16 num_vf_qps;/* num queue pairs per VF */ -u16 num_vf_msix;/* num vectors per VF */ +u16 num_qps_per_vf; +u16 num_msix_per_vf;/* used to ratelimit the MDD event logging */ unsigned long last_printed_mdd_jiffies;DECLARE_BITMAP (state, __ICE_STATE_NBITS);
drivers/net/ethernet/intel/ice/ice_lib.c +108 -92
228 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +35 -31
170 lines not on this page · raw message
Signature · 1 line
2.20.1
Bowers
PATCH 3/15 ice: Improve clarity of prints and variables
Quoted 23 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 03/15] ice: Improve clarity of prints and variablesFrom: Brett Creeley <[email protected]>
Currently when the device runs out of MSI-X interrupts a cryptic and unhelpful message is printed. This will cause confusion when hitting this case. Fix this by clearing up the error message for both SR-IOV and non SR-IOV use cases.
Also, make a few minor changes to increase clarity of variables.
1. Change per VF MSI-X and queue pair variables in the PF structure.
2. UseICE_NONQ_VECS_VFwhen determiningpf->num_msix_per_vfinstead of the magic number "1". This vector is reserved for the OICR.All of the resource tracking functions were moved to avoid adding any forward declaration function prototypes.
Quoted 7 lines
Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice.h | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 200 ++++++++++-------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 66 +++--- 3 files changed, 145 insertions(+), 125 deletions(-)
Tony Nguyen
maintainerPATCH 4/15 ice: Add support for tunnel offloads
In reply to Tony NguyenCreate a boost TCAM entry for each tunnel port in order to get a tunnel PTYPE. Update netdev feature flags and implement the appropriate logic to get and set values for hardware offloads.
--- drivers/net/ethernet/intel/ice/ice.h | 4 + .../net/ethernet/intel/ice/ice_flex_pipe.c | 477 +++++++++++++++++- .../net/ethernet/intel/ice/ice_flex_pipe.h | 5 + .../net/ethernet/intel/ice/ice_flex_type.h | 32 ++ drivers/net/ethernet/intel/ice/ice_flow.c | 36 +- drivers/net/ethernet/intel/ice/ice_flow.h | 3 + .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 25 + drivers/net/ethernet/intel/ice/ice_main.c | 98 +++- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx.c | 126 ++++- drivers/net/ethernet/intel/ice/ice_txrx.h | 3 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 21 +- drivers/net/ethernet/intel/ice/ice_type.h | 3 + 13 files changed, 820 insertions(+), 14 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +4 -0
@@ -37,6 +37,10 @@#include <linux/avf/virtchnl.h> #include <net/ipv6.h> #include <net/xdp_sock.h> +#include <net/geneve.h> +#include <net/gre.h> +#include <net/udp_tunnel.h> +#include <net/vxlan.h> #include "ice_devids.h" #include "ice_type.h" #include "ice_txrx.h"
drivers/net/ethernet/intel/ice/ice_flex_pipe.c +476 -1
501 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_flex_pipe.h +5 -0
@@ -18,6 +18,11 @@#define ICE_PKG_CNT 4 +enum ice_status +ice_create_tunnel (struct ice_hw *hw,enum ice_tunnel_type type,u16 port); +enum ice_status ice_destroy_tunnel (struct ice_hw *hw,u16 port,bool all); +bool ice_tunnel_port_in_use (struct ice_hw *hw,u16 port,u16 *index); +enum ice_status ice_add_prof (struct ice_hw *hw,enum ice_block blk,u64 id,u8 ptypes[],struct ice_fv_word *es);
drivers/net/ethernet/intel/ice/ice_flex_type.h +32 -0
@@ -149,6 +149,7 @@ struct ice_buf_hdr {#define ICE_SID_CDID_REDIR_RSS 48#define ICE_SID_RXPARSER_BOOST_TCAM 56 +#define ICE_SID_TXPARSER_BOOST_TCAM 66#define ICE_SID_XLT0_PE 80#define ICE_SID_XLT_KEY_BUILDER_PE 81
@@ -291,6 +292,37 @@ struct ice_pkg_enum {void *(*handler)(u32 sect_type,void *section,u32 index,u32 *offset); }; +/* Tunnel enabling */ + +enum ice_tunnel_type { +TNL_VXLAN =0 , +TNL_GENEVE , +TNL_LAST =0xFF , +TNL_ALL =0xFF , +}; + +struct ice_tunnel_type_scan { +enum ice_tunnel_type type; +const char *label_prefix; +}; + +struct ice_tunnel_entry { +enum ice_tunnel_type type; +u16 boost_addr; +u16 port; +struct ice_boost_tcam_entry *boost_entry; +u8 valid; +u8 in_use; +u8 marked; +}; + +#define ICE_TUNNEL_MAX_ENTRIES 16 + +struct ice_tunnel_table { +struct ice_tunnel_entry tbl[ICE_TUNNEL_MAX_ENTRIES ]; +u16 count; +}; +struct ice_pkg_es {__le16 count;__le16 offset;
drivers/net/ethernet/intel/ice/ice_flow.c +35 -1
@@ -42,7 +42,10 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_SCTP ,0 ,sizeof (__be16)),/* ICE_FLOW_FIELD_IDX_SCTP_DST_PORT */ ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_SCTP ,2 ,sizeof (__be16)), - +/* GRE */ +/* ICE_FLOW_FIELD_IDX_GRE_KEYID */ +ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_GRE ,12 , + sizeof_field(struct gre_full_hdr, key)), };/* Bitmaps indicating relevant packet types for a particular protocol header
@@ -134,6 +137,18 @@ static const u32 ice_ptypes_sctp_il[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +/* Packet types for packets with an Outermost/First GRE header */ +static const u32 ice_ptypes_gre_of[] = { +0x00000000 ,0xBFBF7800 ,0x000001DF ,0xFEFDE000 , +0x0000017E ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +}; +/* Manage parameters and info. used during the creation of a flow profile */ struct ice_flow_prof_params {enum ice_block blk;
@@ -225,6 +240,12 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) src = (const unsigned long *)ice_ptypes_sctp_il;bitmap_and (params->ptypes, params->ptypes, src,ICE_FLOW_PTYPE_MAX ); + }else if (hdrs &ICE_FLOW_SEG_HDR_GRE ) { +if (!i) { + src = (const unsigned long *)ice_ptypes_gre_of; +bitmap_and (params->ptypes, params->ptypes, + src,ICE_FLOW_PTYPE_MAX ); + } } }
@@ -275,6 +296,9 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,case ICE_FLOW_FIELD_IDX_SCTP_DST_PORT : prot_id =ICE_PROT_SCTP_IL ;break ; +case ICE_FLOW_FIELD_IDX_GRE_KEYID : + prot_id =ICE_PROT_GRE_OF ; +break ;default :return ICE_ERR_NOT_IMPL ; }
@@ -945,6 +969,7 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof)#define ICE_FLOW_PROF_ENCAP_M (BIT_ULL(ICE_FLOW_PROF_ENCAP_S))#define ICE_RSS_OUTER_HEADERS 1 +#define ICE_RSS_INNER_HEADERS 2/* Flow profile ID format: * [0:31] - Packet match fields
@@ -1085,6 +1110,9 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,mutex_lock (&hw->rss_locks); status =ice_add_rss_cfg_sync (hw, vsi_handle, hashed_flds, addl_hdrs,ICE_RSS_OUTER_HEADERS ); +if (!status) + status =ice_add_rss_cfg_sync (hw, vsi_handle, hashed_flds, + addl_hdrs,ICE_RSS_INNER_HEADERS );mutex_unlock (&hw->rss_locks);return status;
@@ -1238,6 +1266,12 @@ enum ice_status ice_replay_rss_cfg(struct ice_hw *hw, u16 vsi_handle) ICE_RSS_OUTER_HEADERS);if (status)break ; + status =ice_add_rss_cfg_sync (hw, vsi_handle, + r->hashed_flds, + r->packet_hdr, +ICE_RSS_INNER_HEADERS ); +if (status) +break ; } }mutex_unlock (&hw->rss_locks);
drivers/net/ethernet/intel/ice/ice_flow.h +3 -0
@@ -43,6 +43,7 @@ enum ice_flow_seg_hdr {ICE_FLOW_SEG_HDR_TCP =0x00000040 ,ICE_FLOW_SEG_HDR_UDP =0x00000080 ,ICE_FLOW_SEG_HDR_SCTP =0x00000100 , + ICE_FLOW_SEG_HDR_GRE = 0x00000200, }; enum ice_flow_field {
@@ -58,6 +59,8 @@ enum ice_flow_field {ICE_FLOW_FIELD_IDX_UDP_DST_PORT ,ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ,ICE_FLOW_FIELD_IDX_SCTP_DST_PORT , +/* GRE */ +ICE_FLOW_FIELD_IDX_GRE_KEYID ,/* The total number of enums must not exceed 64 */ ICE_FLOW_FIELD_IDX_MAX };
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +25 -0
@@ -262,6 +262,12 @@ enum ice_rx_flex_desc_status_error_0_bits { ICE_RX_FLEX_DESC_STATUS0_LAST /* this entry must be last!!! */ }; +enum ice_rx_flex_desc_status_error_1_bits { +/* Note: These are predefined bit offsets */ +ICE_RX_FLEX_DESC_STATUS1_NAT_S =4 , +ICE_RX_FLEX_DESC_STATUS1_LAST /* this entry must be last!!! */ +}; +#define ICE_RXQ_CTX_SIZE_DWORDS 8#define ICE_RXQ_CTX_SZ (ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32))#define ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS 22
@@ -413,6 +419,25 @@ enum ice_tx_ctx_desc_cmd_bits { ICE_TX_CTX_DESC_RESERVED = 0x40 }; +enum ice_tx_ctx_desc_eipt_offload { +ICE_TX_CTX_EIPT_NONE =0x0 , +ICE_TX_CTX_EIPT_IPV6 =0x1 , +ICE_TX_CTX_EIPT_IPV4_NO_CSUM =0x2 , +ICE_TX_CTX_EIPT_IPV4 =0x3 +}; + +#define ICE_TXD_CTX_QW0_EIPLEN_S 2 + +#define ICE_TXD_CTX_QW0_L4TUNT_S 9 + +#define ICE_TXD_CTX_UDP_TUNNELING BIT_ULL(ICE_TXD_CTX_QW0_L4TUNT_S) +#define ICE_TXD_CTX_GRE_TUNNELING (0x2ULL << ICE_TXD_CTX_QW0_L4TUNT_S) + +#define ICE_TXD_CTX_QW0_NATLEN_S 12 + +#define ICE_TXD_CTX_QW0_L4T_CS_S 23 +#define ICE_TXD_CTX_QW0_L4T_CS_M BIT_ULL(ICE_TXD_CTX_QW0_L4T_CS_S) +#define ICE_LAN_TXQ_MAX_QGRPS 127#define ICE_LAN_TXQ_MAX_QDIS 1023
drivers/net/ethernet/intel/ice/ice_main.c +93 -5
143 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_protocol_type.h +1 -0
@@ -18,6 +18,7 @@ enum ice_prot_id {ICE_PROT_IPV6_IL =41 ,ICE_PROT_TCP_IL =49 ,ICE_PROT_UDP_IL_OR_S =53 , +ICE_PROT_GRE_OF =64 ,ICE_PROT_SCTP_IL =96 ,ICE_PROT_META_ID =255 ,/* when offset == metadata */ ICE_PROT_INVALID =255 /* when offset == ICE_FV_OFFSET_INVAL */
drivers/net/ethernet/intel/ice/ice_txrx.c +121 -5
146 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_txrx.h +3 -0
@@ -113,6 +113,9 @@ static inline int ice_skb_pad(void)#define ICE_TX_FLAGS_TSO BIT(0)#define ICE_TX_FLAGS_HW_VLAN BIT(1)#define ICE_TX_FLAGS_SW_VLAN BIT(2) +#define ICE_TX_FLAGS_IPV4 BIT(5) +#define ICE_TX_FLAGS_IPV6 BIT(6) +#define ICE_TX_FLAGS_TUNNEL BIT(7)#define ICE_TX_FLAGS_VLAN_M 0xffff0000#define ICE_TX_FLAGS_VLAN_PR_M 0xe0000000#define ICE_TX_FLAGS_VLAN_PR_S 29
drivers/net/ethernet/intel/ice/ice_txrx_lib.c +19 -2
@@ -84,12 +84,17 @@ ice_rx_csum(struct ice_ring *ring, struct sk_buff *skb, union ice_32b_rx_flex_desc *rx_desc, u8 ptype) {struct ice_rx_ptype_decoded decoded; -u32 rx_error, rx_status; +u16 rx_error, rx_status; +u16 rx_stat_err1;bool ipv4, ipv6; rx_status =le16_to_cpu (rx_desc->wb.status_error0); - rx_error = rx_status; + rx_error = rx_status & (BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_IPE_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S )); + rx_stat_err1 =le16_to_cpu (rx_desc->wb.status_error1); decoded =ice_decode_rx_desc_ptype (ptype);/* Start with CHECKSUM_NONE and by default csum_level = 0 */
@@ -125,6 +130,18 @@ ice_rx_csum(struct ice_ring *ring, struct sk_buff *skb,if (rx_error &BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S )) goto checksum_fail; +/* check for outer UDP checksum error in tunneled packets */ +if ((rx_stat_err1 &BIT (ICE_RX_FLEX_DESC_STATUS1_NAT_S )) && + (rx_error &BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + goto checksum_fail; + +/* If there is an outer header present that might contain a checksum +* we need to bump the checksum level by 1 to reflect the fact that +* we are indicating we validated the inner checksum. +*/ +if (decoded.tunnel_type >=ICE_RX_PTYPE_TUNNEL_IP_GRENAT ) + skb->csum_level =1 ; +/* Only report checksum unnecessary for TCP, UDP, or SCTP */ switch (decoded.inner_prot) {case ICE_RX_PTYPE_INNER_PROT_TCP :
drivers/net/ethernet/intel/ice/ice_type.h +3 -0
@@ -563,6 +563,9 @@ struct ice_hw {u8 *pkg_copy;u32 pkg_size; +/* tunneling info */ +struct ice_tunnel_table tnl; +/* HW block tables */ struct ice_blk_info blk[ICE_BLK_COUNT ];struct mutex fl_profs_locks[ICE_BLK_COUNT ];/* lock fltr profiles */
Signature · 1 line
2.20.1
Bowers
PATCH 4/15 ice: Add support for tunnel offloads
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 04/15] ice: Add support for tunnel offloadsCreate a boost TCAM entry for each tunnel port in order to get a tunnel PTYPE. Update netdev feature flags and implement the appropriate logic to get and set values for hardware offloads.
Signed-off-by Tony Nguyen <[email protected]>Signed-off-by Henry Tieman <[email protected]>
Quoted 15 lines
--- drivers/net/ethernet/intel/ice/ice.h | 4 + .../net/ethernet/intel/ice/ice_flex_pipe.c | 477 +++++++++++++++++- .../net/ethernet/intel/ice/ice_flex_pipe.h | 5 + .../net/ethernet/intel/ice/ice_flex_type.h | 32 ++ drivers/net/ethernet/intel/ice/ice_flow.c | 36 +- drivers/net/ethernet/intel/ice/ice_flow.h | 3 + .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 25 + drivers/net/ethernet/intel/ice/ice_main.c | 98 +++- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx.c | 126 ++++- drivers/net/ethernet/intel/ice/ice_txrx.h | 3 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 21 +- drivers/net/ethernet/intel/ice/ice_type.h | 3 + 13 files changed, 820 insertions(+), 14 deletions(-)
Tony Nguyen
maintainerPATCH 5/15 ice: Fix removing driver while bare-metal VFs pass traffic
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently, if there are bare-metal VFs passing traffic and the ice driver is removed, there is a possibility of VFs triggering a Tx timeout right before iavf_remove(). This is causing iavf_close() to not be called because there is a check in the beginning of iavf_remove() that bails out early if (adapter->state < IAVF_DOWN_PENDING). This makes it so some resources do not get cleaned up. Specifically, free_irq() is never called for data interrupts, which results in the following line of code to trigger:
pci_disable_msix()
free_msi_irqs() ... BUG_ON(irq_has_action(entry->irq + i)); ...
To prevent the Tx timeout from occurring on the VF during driver unload for ice and the iavf there are a few changes that are needed.
[1] Don't disable all active VF Tx/Rx queues prior to calling pci_disable_sriov.
[2] Call ice_free_vfs() before disabling the service task.
[3] Disable VF resets when the ice driver is being unloaded by setting the pf->state flag __ICE_VF_RESETS_DISABLED.
Changing [1] and [2] allow each VF driver's remove flow to successfully send VIRTCHNL requests, which includes queue disable. This prevents unexpected Tx timeouts because the PF driver is no longer forcefully disabling queues.
Due to [1] and [2] there is a possibility that the PF driver will get a VFLR or reset request over VIRTCHNL from a VF during PF driver unload. Prevent that by doing [3].
--- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 19 +++++++++++++++---- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +1 -0
@@ -220,6 +220,7 @@ enum ice_state { __ICE_SERVICE_DIS, __ICE_OICR_INTR_DIS,/* Global OICR interrupt disabled */ __ICE_MDD_VF_PRINT_PENDING,/* set when MDD event handle */ + __ICE_VF_RESETS_DISABLED,/* disable resets during ice_remove */ __ICE_STATE_NBITS /* must be last */ };
drivers/net/ethernet/intel/ice/ice_main.c +15 -4
@@ -2060,8 +2060,16 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)set_bit (__ICE_MDD_EVENT_PENDING, pf->state); }if (oicr &PFINT_OICR_VFLR_M ) { - ena_mask &= ~PFINT_OICR_VFLR_M ; -set_bit (__ICE_VFLR_EVENT_PENDING, pf->state); +/* disable any further VFLR event notifications */ +if (test_bit (__ICE_VF_RESETS_DISABLED, pf->state)) { +u32 reg =rd32 (hw,PFINT_OICR_ENA ); + + reg &= ~PFINT_OICR_VFLR_M ; +wr32 (hw,PFINT_OICR_ENA , reg); + }else { + ena_mask &= ~PFINT_OICR_VFLR_M ; +set_bit (__ICE_VFLR_EVENT_PENDING, pf->state); + } }if (oicr &PFINT_OICR_GRST_M ) {
@@ -3457,6 +3465,11 @@ static void ice_remove(struct pci_dev *pdev)msleep (100 ); } +if (test_bit (ICE_FLAG_SRIOV_ENA , pf->flags)) { +set_bit (__ICE_VF_RESETS_DISABLED, pf->state); +ice_free_vfs (pf); + } +ice_service_task_stop (pf);if (ice_is_peer_ena (pf)) { reason =IIDC_REASON_INTERFACE_DOWN ;
@@ -3464,8 +3477,6 @@ static void ice_remove(struct pci_dev *pdev) }set_bit (__ICE_DOWN, pf->state); -if (test_bit (ICE_FLAG_SRIOV_ENA , pf->flags)) -ice_free_vfs (pf);ice_vsi_release_all (pf);if (ice_is_peer_ena (pf)) {ice_for_each_peer (pf,NULL , ice_unreg_peer_device);
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +13 -6
@@ -300,11 +300,6 @@ void ice_free_vfs(struct ice_pf *pf)while (test_and_set_bit (__ICE_VF_DIS, pf->state))usleep_range (1000 ,2000 ); -/* Avoid wait time by stopping all VFs at the same time */ -ice_for_each_vf (pf, i) -if (test_bit (ICE_VF_STATE_QS_ENA , pf->vf[i].vf_states)) -ice_dis_vf_qs (&pf->vf[i]); -/* Disable IOV before freeing resources. This lets any VF drivers * running in the host get themselves cleaned up before we yank * the carpet out from underneath their feet.
@@ -314,6 +309,11 @@ void ice_free_vfs(struct ice_pf *pf)else dev_warn (dev,"VFs are assigned - not disabling SR-IOV\n" ); +/* Avoid wait time by stopping all VFs at the same time */ +ice_for_each_vf (pf, i) +if (test_bit (ICE_VF_STATE_QS_ENA , pf->vf[i].vf_states)) +ice_dis_vf_qs (&pf->vf[i]); + tmp = pf->num_alloc_vfs; pf->num_qps_per_vf =0 ; pf->num_alloc_vfs =0 ;
@@ -1155,7 +1155,8 @@ static bool ice_is_vf_disabled(struct ice_vf *vf)* @vf: pointer to the VF structure * @is_vflr: true if VFLR was issued, false if not * -* Returns true if the VF is reset, false otherwise. +* Returns true if the VF is currently in reset, resets successfully, or resets +* are disabled and false otherwise. */ bool ice_reset_vf (struct ice_vf *vf,bool is_vflr) {
@@ -1170,6 +1171,12 @@ bool ice_reset_vf(struct ice_vf *vf, bool is_vflr) dev =ice_pf_to_dev (pf); +if (test_bit (__ICE_VF_RESETS_DISABLED, pf->state)) { +dev_dbg (dev,"Trying to reset VF %d, but all VF resets are disabled\n" , + vf->vf_id); +return true; + } +if (ice_is_vf_disabled (vf)) {dev_dbg (dev,"VF is already disabled, there is no need for resetting it, telling VM, all is fine %d\n" , vf->vf_id);
Signature · 1 line
2.20.1
Bowers
PATCH 5/15 ice: Fix removing driver while bare-metal VFs pass traffic
Quoted 42 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 05/15] ice: Fix removing driver while bare-metal VFs pass trafficFrom: Brett Creeley <[email protected]>
Currently, if there are bare-metal VFs passing traffic and the ice driver is removed, there is a possibility of VFs triggering a Tx timeout right before
iavf_remove(). This is causingiavf_close()to not be called because there is a check in the beginning ofiavf_remove()that bails out early if (adapter->state<IAVF_DOWN_PENDING). This makes it so some resources do not get cleaned up. Specifically,free_irq()is never called for data interrupts, which results in the following line of code to trigger:
pci_disable_msix()free_msi_irqs() ... BUG_ON(irq_has_action(entry->irq + i)); ...To prevent the Tx timeout from occurring on the VF during driver unload for ice and the iavf there are a few changes that are needed.
[1] Don't disable all active VF Tx/Rx queues prior to calling
pci_disable_sriov.[2] Call
ice_free_vfs()before disabling the service task.[3] Disable VF resets when the ice driver is being unloaded by setting the pf-
Quoted 1 line
state flag
__ICE_VF_RESETS_DISABLED.Changing [1] and [2] allow each VF driver's remove flow to successfully send VIRTCHNL requests, which includes queue disable. This prevents unexpected Tx timeouts because the PF driver is no longer forcefully disabling queues.
Due to [1] and [2] there is a possibility that the PF driver will get a VFLR or reset request over VIRTCHNL from a VF during PF driver unload. Prevent that by doing [3].
Quoted 6 lines
Signed-off-by Brett Creeley <[email protected]>--- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 19 +++++++++++++++---- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 10 deletions(-)
Tony Nguyen
maintainerPATCH 6/15 ice: Display Link detected via Ethtool in safe mode
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently the "Link detected" field is not shown when the device goes into safe mode. This is because the safe mode Ethtool ops does not set the get_link function. Fix this by setting the safe mode Ethtool op get_link function.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ice/ice_ethtool.c +1 -0
@@ -3866,6 +3866,7 @@ static const struct ethtool_ops ice_ethtool_safe_mode_ops = { .get_regs = ice_get_regs, .get_msglevel = ice_get_msglevel, .set_msglevel = ice_set_msglevel, + .get_link = ethtool_op_get_link, .get_eeprom_len = ice_get_eeprom_len, .get_eeprom = ice_get_eeprom, .get_strings = ice_get_strings,
Signature · 1 line
2.20.1
Bowers
PATCH 6/15 ice: Display Link detected via Ethtool in safe mode
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 06/15] ice: Display Link detected via Ethtool in safe modeFrom: Brett Creeley <[email protected]>
Currently the "Link detected" field is not shown when the device goes into safe mode. This is because the safe mode Ethtool ops does not set the
get_linkfunction. Fix this by setting the safe mode Ethtool opget_linkfunction.
Quoted 4 lines
Signed-off-by Brett Creeley <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 + 1 file changed, 1 insertion(+)
Tony Nguyen
maintainerPATCH 7/15 ice: Fix corner case when switching from IEEE to CEE
In reply to Tony NguyenFrom: Avinash JD <[email protected]>
While testing DCB for a corner case in which mode is switched from IEEE to CEE and pfc_ena bitmask unchanged then DCBX mode doesn't get updated.
This is happening because the function ice_dcb_get_mode() is called in a "no change detected block" instead of "change detected block".
--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +2 -1
@@ -873,10 +873,11 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,/* No change detected in DCBX configs */ if (!memcmp (&tmp_dcbx_cfg, &pi->local_dcbx_cfg,sizeof (tmp_dcbx_cfg))) {dev_dbg (dev,"No change detected in DCBX configuration.\n" ); - pf->dcbx_cap =ice_dcb_get_mode (pi, false); goto out; } + pf->dcbx_cap =ice_dcb_get_mode (pi, false); + need_reconfig =ice_dcb_need_recfg (pf, &tmp_dcbx_cfg, &pi->local_dcbx_cfg);ice_dcbnl_flush_apps (pf, &tmp_dcbx_cfg, &pi->local_dcbx_cfg);
Signature · 1 line
2.20.1
Bowers
PATCH 7/15 ice: Fix corner case when switching from IEEE to CEE
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 07/15] ice: Fix corner case when switching from IEEE to CEEFrom: Avinash JD <[email protected]>
While testing DCB for a corner case in which mode is switched from IEEE to CEE and
pfc_enabitmask unchanged then DCBX mode doesn't get updated.
Quoted 8 lines
This is happening because the function
ice_dcb_get_mode()is called in a "no change detected block" instead of "change detected block".Signed-off-by Avinash JD <[email protected]>Signed-off-by Scott Register <[email protected]>--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Tony Nguyen
maintainerPATCH 8/15 ice: renegotiate link after FW DCB on
In reply to Tony NguyenFrom: Dave Ertman <[email protected]>
When switching from SW DCB to FW DCB it is necessary to renegotiate DCBx so that the FW agent can have up to date information about the DCB settings of the link partner.
Perform an autoneg restart on the link when activating FW DCB.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 53 +++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +29 -24
@@ -1131,6 +1131,33 @@ ice_get_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam)return err; } +/** +* ice_nway_reset - restart autonegotiation +* @netdev: network interface device structure +*/ +static int ice_nway_reset (struct net_device *netdev) +{ +struct ice_netdev_priv *np =netdev_priv (netdev); +struct ice_vsi *vsi = np->vsi; +struct ice_port_info *pi; +enum ice_status status; + + pi = vsi->port_info; +/* If VSI state is up, then restart autoneg with link up */ +if (!test_bit (__ICE_DOWN, vsi->back->state)) + status =ice_aq_set_link_restart_an (pi, true,NULL ); +else + status =ice_aq_set_link_restart_an (pi, false,NULL ); + +if (status) { +netdev_info (netdev,"link restart failed, err %d aq_err %d\n" , + status, pi->hw->adminq.sq_last_status); +return -EIO ; + } + +return 0 ; +} +/** * ice_get_priv_flags - report device private flags * @netdev: network interface device structure
@@ -1264,6 +1291,8 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) status =ice_cfg_lldp_mib_change (&pf->hw, true);if (status)dev_dbg (dev,"Fail to enable MIB change events\n" ); + +ice_nway_reset (netdev); } }if (test_bit (ICE_FLAG_LEGACY_RX , change_flags)) {
@@ -2775,30 +2804,6 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)return err; } -static int ice_nway_reset (struct net_device *netdev) -{ -/* restart autonegotiation */ -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_vsi *vsi = np->vsi; -struct ice_port_info *pi; -enum ice_status status; - - pi = vsi->port_info; -/* If VSI state is up, then restart autoneg with link up */ -if (!test_bit (__ICE_DOWN, vsi->back->state)) - status =ice_aq_set_link_restart_an (pi, true,NULL ); -else - status =ice_aq_set_link_restart_an (pi, false,NULL ); - -if (status) { -netdev_info (netdev,"link restart failed, err %d aq_err %d\n" , - status, pi->hw->adminq.sq_last_status); -return -EIO ; - } - -return 0 ; -} -/** * ice_get_pauseparam - Get Flow Control status * @netdev: network interface device structure
Signature · 1 line
2.20.1
Bowers
PATCH 8/15 ice: renegotiate link after FW DCB on
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 08/15] ice: renegotiate link after FW DCB onFrom: Dave Ertman <[email protected]>
When switching from SW DCB to FW DCB it is necessary to renegotiate DCBx so that the FW agent can have up to date information about the DCB settings of the link partner.
Quoted 6 lines
Perform an autoneg restart on the link when activating FW DCB.
Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 53 +++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-)
Tony Nguyen
maintainerPATCH 9/15 ice: Correct setting VLAN pruning
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
VLAN pruning is not always being set correctly due to a previous change that set Tx antispoof off. ice_vsi_is_vlan_pruning_ena() currently checks for both Tx antispoof and Rx pruning. The expectation for this function is to only check Rx pruning so fix the check.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ice/ice_lib.c +2 -8
@@ -1912,20 +1912,14 @@ int ice_vsi_stop_xdp_tx_rings(struct ice_vsi *vsi)* ice_vsi_is_vlan_pruning_ena - check if VLAN pruning is enabled or not * @vsi: VSI to check whether or not VLAN pruning is enabled. * -* returns true if Rx VLAN pruning and Tx VLAN anti-spoof is enabled and false -* otherwise. +* returns true if Rx VLAN pruning is enabled and false otherwise. */ bool ice_vsi_is_vlan_pruning_ena (struct ice_vsi *vsi) { -u8 rx_pruning =ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA ; -u8 tx_pruning =ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA << -ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S ; -if (!vsi)return false; -return ((vsi->info.sw_flags2 & rx_pruning) && - (vsi->info.sec_flags & tx_pruning)); +return (vsi->info.sw_flags2 &ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA ); }/**
Signature · 1 line
2.20.1
Bowers
PATCH 9/15 ice: Correct setting VLAN pruning
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 09/15] ice: Correct setting VLAN pruningFrom: Brett Creeley <[email protected]>
VLAN pruning is not always being set correctly due to a previous change that set Tx antispoof off.
ice_vsi_is_vlan_pruning_ena()currently checks for both Tx antispoof and Rx pruning. The expectation for this function is to only check Rx pruning so fix the check.
Quoted 6 lines
Fixes cd6d6b83316a ("ice: Fix VF spoofchk")Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_lib.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
Tony Nguyen
maintainerPATCH 10/15 ice: Increase mailbox receive queue length to maximum
In reply to Tony NguyenFrom: Lukasz Czapnik <[email protected]>
Currently the PF's mailbox receive queue is only 512 entries. This fine, but considering that all VF's mailbox send queues funnel into the PF's single mailbox receive queue, let's increase it to the maximum size. This will help prevent any possible bottleneck/slowdown occurring from the PF's mailbox receive queue being full.
--- drivers/net/ethernet/intel/ice/ice.h | 1 - drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +0 -1
@@ -66,7 +66,6 @@ extern const char ice_drv_ver[];#define ICE_INT_NAME_STR_LEN (IFNAMSIZ + 16)#define ICE_AQ_LEN 64#define ICE_MBXSQ_LEN 64 -#define ICE_MBXRQ_LEN 512#define ICE_MIN_MSIX 2#define ICE_NO_VSI 0xffff#define ICE_VSI_MAP_CONTIG 0
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -1524,7 +1524,7 @@ static void ice_set_ctrlq_len(struct ice_hw *hw) hw->adminq.num_sq_entries =ICE_AQ_LEN ; hw->adminq.rq_buf_size =ICE_AQ_MAX_BUF_LEN ; hw->adminq.sq_buf_size =ICE_AQ_MAX_BUF_LEN ; - hw->mailboxq.num_rq_entries =ICE_MBXRQ_LEN ; + hw->mailboxq.num_rq_entries =PF_MBX_ARQLEN_ARQLEN_M ; hw->mailboxq.num_sq_entries =ICE_MBXSQ_LEN ; hw->mailboxq.rq_buf_size =ICE_MBXQ_MAX_BUF_LEN ; hw->mailboxq.sq_buf_size =ICE_MBXQ_MAX_BUF_LEN ;
Signature · 1 line
2.20.1
Bowers
PATCH 10/15 ice: Increase mailbox receive queue length to maximum
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 10/15] ice: Increase mailbox receive queue length to maximumFrom: Lukasz Czapnik <[email protected]>
Currently the PF's mailbox receive queue is only 512 entries. This fine, but considering that all VF's mailbox send queues funnel into the PF's single mailbox receive queue, let's increase it to the maximum size. This will help prevent any possible bottleneck/slowdown occurring from the PF's mailbox receive queue being full.
Quoted 7 lines
Signed-off-by Lukasz Czapnik <[email protected]>Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice.h | 1 - drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
Tony Nguyen
maintainerPATCH 11/15 ice: fix use of deprecated strlcpy()
In reply to Tony NguyenFrom: Bruce Allan <[email protected]>
checkpatch complains "CHECK:DEPRECATED_API: Deprecated use of 'strlcpy', prefer 'stracpy or strscpy' instead"; use strscpy.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +3 -3
@@ -173,8 +173,8 @@ ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)struct ice_hw *hw = &pf->hw;u16 oem_build; -strlcpy (drvinfo->driver,KBUILD_MODNAME ,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version, ice_drv_ver,sizeof (drvinfo->version)); +strscpy (drvinfo->driver,KBUILD_MODNAME ,sizeof (drvinfo->driver)); +strscpy (drvinfo->version, ice_drv_ver,sizeof (drvinfo->version));/* Display NVM version (from which the firmware version can be * determined) which contains more pertinent information.
@@ -185,7 +185,7 @@ ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)"%x.%02x 0x%x %d.%d.%d" , nvm_ver_hi, nvm_ver_lo, hw->nvm.eetrack, oem_ver, oem_build, oem_patch); -strlcpy (drvinfo->bus_info,pci_name (pf->pdev), +strscpy (drvinfo->bus_info,pci_name (pf->pdev),sizeof (drvinfo->bus_info)); drvinfo->n_priv_flags =ICE_PRIV_FLAG_ARRAY_SIZE ; }
Signature · 1 line
2.20.1
Bowers
PATCH 11/15 ice: fix use of deprecated strlcpy()
Quoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 11/15] ice: fix use of deprecatedstrlcpy()From: Bruce Allan <[email protected]>
Quoted 7 lines
checkpatch complains "CHECK:DEPRECATED_API: Deprecated use of 'strlcpy', prefer 'stracpy or strscpy' instead"; use strscpy.
Signed-off-by Bruce Allan <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Tony Nguyen
maintainerPATCH 12/15 ice: Fix format specifier
In reply to Tony NguyenCommit ed5a3f664c55 ("ice: Removing hung_queue variable to use txqueue function parameter") began utilizing the txqueue variable over the hung_queue variable. hung_queue was an int where txqueue is an unsigned int. Update the format specfiers to reflect the new type.
--- drivers/net/ethernet/intel/ice/ice_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5205,13 +5205,13 @@ static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)/* Read interrupt register */ val =rd32 (hw,GLINT_DYN_CTL (tx_ring->q_vector->reg_idx)); -netdev_info (netdev,"tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n" , +netdev_info (netdev,"tx_timeout: VSI_num: %d, Q %u, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n" , vsi->vsi_num, txqueue, tx_ring->next_to_clean, head, tx_ring->next_to_use, val); } pf->tx_timeout_last_recovery = jiffies; -netdev_info (netdev,"tx_timeout recovery level %d, txqueue %d\n" , +netdev_info (netdev,"tx_timeout recovery level %d, txqueue %u\n" , pf->tx_timeout_recovery_level, txqueue);switch (pf->tx_timeout_recovery_level) {
Signature · 1 line
2.20.1
Bowers
PATCH 12/15 ice: Fix format specifier
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 12/15] ice: Fix format specifierCommit
ed5a3f664c55("ice: Removinghung_queuevariable to use txqueue function parameter") began utilizing the txqueue variable over thehung_queuevariable.hung_queuewas an int where txqueue is an unsigned int. Update the format specfiers to reflect the new type.
Quoted 6 lines
Fixes ed5a3f664c55 ("ice: Removing hung_queue variable to use txqueuefunction parameter")
Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Tony Nguyen
maintainerPATCH 13/15 ice: Use EOPNOTSUPP instead of ENOTSUPP
In reply to Tony NguyenFrom: Anirudh Venkataramanan <[email protected]>
Using ENOTSUPP almost always results in some bizarre error message to be printed in userspace. This is likely because ENOTSUPP was defined for the NFS protocol (as per a comment in include/linux/errno.h). Use EOPNOTSUPP instead.
--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/ice/ice_xsk.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +1 -1
@@ -1404,7 +1404,7 @@ static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs)if (num_vfs > pf->num_vfs_supported) {dev_err (dev,"Can't enable %d VFs, max VFs supported is %d\n" , num_vfs, pf->num_vfs_supported); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }dev_info (dev,"Allocating %d VFs\n" , num_vfs);
drivers/net/ethernet/intel/ice/ice_xsk.h +2 -2
@@ -24,7 +24,7 @@ ice_xsk_umem_setup(struct ice_vsi __always_unused *vsi, struct xdp_umem __always_unused *umem, u16 __always_unused qid) { -return -ENOTSUPP ; +return -EOPNOTSUPP ; } static inline void
@@ -63,7 +63,7 @@ static inline int ice_xsk_wakeup(struct net_device __always_unused *netdev, u32 __always_unused queue_id, u32 __always_unused flags) { - return -ENOTSUPP; + return -EOPNOTSUPP; }#define ice_xsk_clean_rx_ring (rx_ring) do {} while (0)
Signature · 1 line
2.20.1
Bowers
PATCH 13/15 ice: Use EOPNOTSUPP instead of ENOTSUPP
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 13/15] ice: Use EOPNOTSUPP instead of ENOTSUPPFrom: Anirudh Venkataramanan <[email protected]>
Using ENOTSUPP almost always results in some bizarre error message to be printed in userspace. This is likely because ENOTSUPP was defined for the NFS protocol (as per a comment in
include/linux/errno.h). Use EOPNOTSUPP instead.
Quoted 7 lines
Signed-off-by: Anirudh Venkataramanan
<[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/ice/ice_xsk.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Tony Nguyen
maintainerPATCH 14/15 ice: use variable name more descriptive than type
In reply to Tony NguyenFrom: Bruce Allan <[email protected]>
The variable name 'type' is not very descriptive. Replace instances of those with a variable name that is more descriptive or replace it if not needed.
--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 16 ++++++------- drivers/net/ethernet/intel/ice/ice_flow.c | 8 +++---- drivers/net/ethernet/intel/ice/ice_lib.c | 24 ++++++++++---------- drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++-- drivers/net/ethernet/intel/ice/ice_switch.c | 20 ++++++++-------- 5 files changed, 36 insertions(+), 36 deletions(-)
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +8 -8
@@ -820,7 +820,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,bool need_reconfig = false;struct ice_port_info *pi;struct ice_vsi *pf_vsi; -u8 type; +u8 mib_type;int ret;/* Not DCB capable or capability disabled */
@@ -835,16 +835,16 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, pi = pf->hw.port_info; mib = (struct ice_aqc_lldp_get_mib *)&event->desc.params.raw;/* Ignore if event is not for Nearest Bridge */ - type = ((mib->type >>ICE_AQ_LLDP_BRID_TYPE_S ) & -ICE_AQ_LLDP_BRID_TYPE_M ); -dev_dbg (dev,"LLDP event MIB bridge type 0x%x\n" , type); -if (type !=ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID ) + mib_type = ((mib->type >>ICE_AQ_LLDP_BRID_TYPE_S ) & +ICE_AQ_LLDP_BRID_TYPE_M ); +dev_dbg (dev,"LLDP event MIB bridge type 0x%x\n" , mib_type); +if (mib_type !=ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID )return ;/* Check MIB Type and return if event for Remote MIB update */ - type = mib->type &ICE_AQ_LLDP_MIB_TYPE_M ; -dev_dbg (dev,"LLDP event mib type %s\n" , type ?"remote" :"local" ); -if (type ==ICE_AQ_LLDP_MIB_REMOTE ) { + mib_type = mib->type &ICE_AQ_LLDP_MIB_TYPE_M ; +dev_dbg (dev,"LLDP event mib type %s\n" , mib_type ?"remote" :"local" ); +if (mib_type ==ICE_AQ_LLDP_MIB_REMOTE ) {/* Update the remote cached instance and return */ ret = ice_aq_get_dcb_cfg(pi->hw, ICE_AQ_LLDP_MIB_REMOTE, ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID,
drivers/net/ethernet/intel/ice/ice_flow.c +4 -4
@@ -718,7 +718,7 @@ ice_flow_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id)* ice_flow_set_fld_ext - specifies locations of field from entry's input buffer * @seg: packet segment the field being set belongs to * @fld: field to be set -* @type: type of the field +* @field_type: type of the field * @val_loc: if not ICE_FLOW_FLD_OFF_INVAL, location of the value to match from * entry's input buffer * @mask_loc: if not ICE_FLOW_FLD_OFF_INVAL, location of mask value from entry's
@@ -739,16 +739,16 @@ ice_flow_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id)*/ static void ice_flow_set_fld_ext (struct ice_flow_seg_info *seg,enum ice_flow_field fld, -enum ice_flow_fld_match_type type,u16 val_loc, +enum ice_flow_fld_match_type field_type,u16 val_loc,u16 mask_loc,u16 last_loc) {u64 bit =BIT_ULL (fld); seg->match |= bit; -if (type ==ICE_FLOW_FLD_TYPE_RANGE ) +if (field_type ==ICE_FLOW_FLD_TYPE_RANGE ) seg->range |= bit; - seg->fields[fld].type = type; + seg->fields[fld].type = field_type; seg->fields[fld].src.val = val_loc; seg->fields[fld].src.mask = mask_loc; seg->fields[fld].src.last = last_loc;
drivers/net/ethernet/intel/ice/ice_lib.c +12 -12
@@ -9,11 +9,11 @@/** * ice_vsi_type_str - maps VSI type enum to string equivalents -* @type: VSI type enum +* @vsi_type: VSI type enum */ -const char *ice_vsi_type_str (enum ice_vsi_type type) +const char *ice_vsi_type_str (enum ice_vsi_type vsi_type) { -switch (type) { +switch (vsi_type) {case ICE_VSI_PF :return "ICE_VSI_PF" ;case ICE_VSI_VF :
@@ -350,13 +350,13 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data)/** * ice_vsi_alloc - Allocates the next available struct VSI in the PF * @pf: board private structure -* @type: type of VSI +* @vsi_type: type of VSI * @vf_id: ID of the VF being configured * * returns a pointer to a VSI on success, NULL on failure. */ static struct ice_vsi * -ice_vsi_alloc (struct ice_pf *pf,enum ice_vsi_type type,u16 vf_id) +ice_vsi_alloc (struct ice_pf *pf,enum ice_vsi_type vsi_type,u16 vf_id) {struct device *dev =ice_pf_to_dev (pf);struct ice_vsi *vsi =NULL ;
@@ -377,13 +377,13 @@ ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type, u16 vf_id)if (!vsi) goto unlock_pf; - vsi->type = type; + vsi->type = vsi_type; vsi->back = pf;set_bit (__ICE_DOWN, vsi->state); vsi->idx = pf->next_vsi; -if (type ==ICE_VSI_VF ) +if (vsi_type ==ICE_VSI_VF )ice_vsi_set_num_qs (vsi, vf_id);else ice_vsi_set_num_qs (vsi,ICE_INVAL_VFID );
@@ -2119,7 +2119,7 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)* ice_vsi_setup - Set up a VSI by a given type * @pf: board private structure * @pi: pointer to the port_info instance -* @type: VSI type +* @vsi_type: VSI type * @vf_id: defines VF ID to which this VSI connects. This field is meant to be * used only for ICE_VSI_VF VSI type. For other VSI types, should * fill-in ICE_INVAL_VFID as input.
@@ -2131,7 +2131,7 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)*/ struct ice_vsi *ice_vsi_setup (struct ice_pf *pf,struct ice_port_info *pi, -enum ice_vsi_type type,u16 vf_id) +enum ice_vsi_type vsi_type,u16 vf_id) {u16 max_txqs[ICE_MAX_TRAFFIC_CLASS ] = {0 };struct device *dev =ice_pf_to_dev (pf);
@@ -2139,10 +2139,10 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,struct ice_vsi *vsi;int ret, i; -if (type ==ICE_VSI_VF ) - vsi =ice_vsi_alloc (pf, type, vf_id); +if (vsi_type ==ICE_VSI_VF ) + vsi =ice_vsi_alloc (pf, vsi_type, vf_id);else - vsi =ice_vsi_alloc (pf, type,ICE_INVAL_VFID ); + vsi =ice_vsi_alloc (pf, vsi_type,ICE_INVAL_VFID );if (!vsi) {dev_err (dev,"could not allocate VSI\n" );
drivers/net/ethernet/intel/ice/ice_lib.h +2 -2
@@ -6,7 +6,7 @@#include "ice.h" -const char *ice_vsi_type_str (enum ice_vsi_type type); +const char *ice_vsi_type_str (enum ice_vsi_type vsi_type); int ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list,
@@ -60,7 +60,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);struct ice_vsi *ice_vsi_setup (struct ice_pf *pf,struct ice_port_info *pi, -enum ice_vsi_type type,u16 vf_id); +enum ice_vsi_type vsi_type,u16 vf_id);void ice_napi_del (struct ice_vsi *vsi);
drivers/net/ethernet/intel/ice/ice_switch.c +10 -10
@@ -605,7 +605,7 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw)struct ice_aqc_get_sw_cfg_resp_elem *ele;u16 pf_vf_num, swid, vsi_port_num;bool is_vf = false; -u8 type; +u8 res_type; ele = rbuf[i].elements; vsi_port_num = le16_to_cpu(ele->vsi_port_num) &
@@ -620,16 +620,16 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw) ICE_AQC_GET_SW_CONF_RESP_IS_VF) is_vf = true; - type =le16_to_cpu (ele->vsi_port_num) >> + res_type =le16_to_cpu (ele->vsi_port_num) >>ICE_AQC_GET_SW_CONF_RESP_TYPE_S ; -if (type ==ICE_AQC_GET_SW_CONF_RESP_VSI ) { +if (res_type ==ICE_AQC_GET_SW_CONF_RESP_VSI ) {/* FW VSI is not needed. Just continue. */ continue ; }ice_init_port_info (hw->port_info, vsi_port_num, - type, swid, pf_vf_num, is_vf); + res_type, swid, pf_vf_num, is_vf); } }while (req_desc && !status);
@@ -985,7 +985,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,struct ice_aqc_sw_rules_elem *s_rule;enum ice_status status;u16 s_rule_size; -u16 type; +u16 rule_type;int i;if (!num_vsi)
@@ -997,11 +997,11 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi, lkup_type == ICE_SW_LKUP_ETHERTYPE_MAC || lkup_type == ICE_SW_LKUP_PROMISC || lkup_type == ICE_SW_LKUP_PROMISC_VLAN) - type = remove ?ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR : -ICE_AQC_SW_RULES_T_VSI_LIST_SET ; + rule_type = remove ?ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR : +ICE_AQC_SW_RULES_T_VSI_LIST_SET ; else if (lkup_type == ICE_SW_LKUP_VLAN) - type = remove ?ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR : -ICE_AQC_SW_RULES_T_PRUNE_LIST_SET ; + rule_type = remove ?ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR : +ICE_AQC_SW_RULES_T_PRUNE_LIST_SET ; else return ICE_ERR_PARAM;
@@ -1019,7 +1019,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,cpu_to_le16 (ice_get_hw_vsi_num (hw, vsi_handle_arr[i])); } - s_rule->type =cpu_to_le16 (type); + s_rule->type =cpu_to_le16 (rule_type); s_rule->pdata.vsi_list.number_vsi =cpu_to_le16 (num_vsi); s_rule->pdata.vsi_list.index =cpu_to_le16 (vsi_list_id);
Signature · 1 line
2.20.1
Bowers
PATCH 14/15 ice: use variable name more descriptive than type
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 14/15] ice: use variable name more descriptive than typeFrom: Bruce Allan <[email protected]>
The variable name 'type' is not very descriptive. Replace instances of those with a variable name that is more descriptive or replace it if not needed.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Tony Nguyen <[email protected]>
Quoted 7 lines
--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 16 ++++++------- drivers/net/ethernet/intel/ice/ice_flow.c | 8 +++---- drivers/net/ethernet/intel/ice/ice_lib.c | 24 ++++++++++---------- drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++-- drivers/net/ethernet/intel/ice/ice_switch.c | 20 ++++++++-------- 5 files changed, 36 insertions(+), 36 deletions(-)
Tony Nguyen
maintainerPATCH 15/15 ice: fix incorrect size description of ice_get_nvm_version
In reply to Tony NguyenFrom: Jacob Keller <[email protected]>
The function comment for ice_get_nvm_version indicated that the ver_hi and ver_lo values were 16 bits. In fact, they are only uint8_t values, meaning that they have a maximum size of 8 bits. Fix the comment to match the correct size.
--- drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +2 -2
@@ -620,8 +620,8 @@ static void ice_get_itr_intrl_gran(struct ice_hw *hw)* @oem_ver: 8 bit NVM version * @oem_build: 16 bit NVM build number * @oem_patch: 8 NVM patch number -* @ver_hi: high 16 bits of the NVM version -* @ver_lo: low 16 bits of the NVM version +* @ver_hi: high 8 bits of the NVM version +* @ver_lo: low 8 bits of the NVM version */ void ice_get_nvm_version(struct ice_hw *hw, u8 *oem_ver, u16 *oem_build,
Signature · 1 line
2.20.1
Bowers
PATCH 15/15 ice: fix incorrect size description of ice_get_nvm_version
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 15/15] ice: fix incorrect size description ofice_get_nvm_versionFrom: Jacob Keller <[email protected]>
The function comment for
ice_get_nvm_versionindicated that thever_hiandver_lovalues were 16 bits. In fact, they are onlyuint8_tvalues, meaning that they have a maximum size of 8 bits. Fix the comment to match the correct size.
Quoted 4 lines
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Bowers
PATCH 1/15 iavf: Enable support for up to 16 queues
In reply to Tony NguyenQuoted 22 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, February 27, 2020 10:15 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S40 01/15] iavf: Enable support for up to 16 queuesFrom: Mitch Williams <[email protected]>
Previous devices could only allocate 4 MSI-X vectors per VF so there was a limitation of 4 queues. 800-series hardware can allocate more than 4 MSI-X vectors, so expand the limitation on the number of queues that the driver can support to account for these capabilities.
Fix eththool channel operations to accommodate this change and adjust the reporting of max number of queues to what is given to us by the PF. Since we're not requesting queues above this value, just trigger reset to activate the queues, which we already own.
Finally, fix a test condition that would display an incorrect error message.
Quoted 8 lines
Signed-off-by Mitch Williams <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 20 +++++++------- drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 27 ------------------- 4 files changed, 11 insertions(+), 40 deletions(-)