iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40e: field get conversion

Browse Source 
Refactor the i40e driver to use FIELD_GET() for mask and shift reads,
which reduces lines of code and adds clarity of intent.

This code was generated by the following coccinelle/spatch script and
then manually repaired.

While making one of the conversions, an if() check was inverted to
return early and avoid un-necessary indentation of the remainder of the
function. In some other cases a stack variable was moved inside the
block where it was used while doing cleanups/review.

A couple places were changed to use le16_get_bits() instead of FIELD_GET
with a le16_to_cpu combination.

@get@
constant shift,mask;
metavariable type T;
expression a;
@@
-(((T)(a) & mask) >> shift)
+FIELD_GET(mask, a)

and applied via:
spatch --sp-file field_prep.cocci --in-place --dir \
 drivers/net/ethernet/intel/

Cc: Julia Lawall <Julia.Lawall@inria.fr>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jesse Brandeburg 2023-12-05 17:01:10 -08:00 committed by Tony Nguyen
parent a8e0c7a680
commit 62589808d7
11 changed files with 145 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/net/ethernet/intel/i40e/i40e_common.c
View File

@ -664,11 +664,11 @@ int i40e_init_shared_code(struct i40e_hw *hw)
hw->phy.get_link_info = true; hw->phy.get_link_info = true;
/* Determine port number and PF number*/ /* Determine port number and PF number*/
port = (rd32(hw, I40E_PFGEN_PORTNUM) & I40E_PFGEN_PORTNUM_PORT_NUM_MASK) port = FIELD_GET(I40E_PFGEN_PORTNUM_PORT_NUM_MASK,
>> I40E_PFGEN_PORTNUM_PORT_NUM_SHIFT; rd32(hw, I40E_PFGEN_PORTNUM));
hw->port = (u8)port; hw->port = (u8)port;
ari = (rd32(hw, I40E_GLPCI_CAPSUP) & I40E_GLPCI_CAPSUP_ARI_EN_MASK) >> ari = FIELD_GET(I40E_GLPCI_CAPSUP_ARI_EN_MASK,
I40E_GLPCI_CAPSUP_ARI_EN_SHIFT; rd32(hw, I40E_GLPCI_CAPSUP));
func_rid = rd32(hw, I40E_PF_FUNC_RID); func_rid = rd32(hw, I40E_PF_FUNC_RID);
if (ari) if (ari)
hw->pf_id = (u8)(func_rid & 0xff); hw->pf_id = (u8)(func_rid & 0xff);
@ -986,9 +986,8 @@ int i40e_pf_reset(struct i40e_hw *hw)
* The grst delay value is in 100ms units, and we'll wait a * The grst delay value is in 100ms units, and we'll wait a
* couple counts longer to be sure we don't just miss the end. * couple counts longer to be sure we don't just miss the end.
*/ */
grst_del = (rd32(hw, I40E_GLGEN_RSTCTL) & grst_del = FIELD_GET(I40E_GLGEN_RSTCTL_GRSTDEL_MASK,
I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >> rd32(hw, I40E_GLGEN_RSTCTL));
I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;
/* It can take upto 15 secs for GRST steady state. /* It can take upto 15 secs for GRST steady state.
* Bump it to 16 secs max to be safe. * Bump it to 16 secs max to be safe.
@ -1080,26 +1079,20 @@ void i40e_clear_hw(struct i40e_hw *hw)
/* get number of interrupts, queues, and VFs */ /* get number of interrupts, queues, and VFs */
val = rd32(hw, I40E_GLPCI_CNF2); val = rd32(hw, I40E_GLPCI_CNF2);
num_pf_int = (val & I40E_GLPCI_CNF2_MSI_X_PF_N_MASK) >> num_pf_int = FIELD_GET(I40E_GLPCI_CNF2_MSI_X_PF_N_MASK, val);
I40E_GLPCI_CNF2_MSI_X_PF_N_SHIFT; num_vf_int = FIELD_GET(I40E_GLPCI_CNF2_MSI_X_VF_N_MASK, val);
num_vf_int = (val & I40E_GLPCI_CNF2_MSI_X_VF_N_MASK) >>
I40E_GLPCI_CNF2_MSI_X_VF_N_SHIFT;
val = rd32(hw, I40E_PFLAN_QALLOC); val = rd32(hw, I40E_PFLAN_QALLOC);
base_queue = (val & I40E_PFLAN_QALLOC_FIRSTQ_MASK) >> base_queue = FIELD_GET(I40E_PFLAN_QALLOC_FIRSTQ_MASK, val);
I40E_PFLAN_QALLOC_FIRSTQ_SHIFT; j = FIELD_GET(I40E_PFLAN_QALLOC_LASTQ_MASK, val);
j = (val & I40E_PFLAN_QALLOC_LASTQ_MASK) >>
I40E_PFLAN_QALLOC_LASTQ_SHIFT;
if (val & I40E_PFLAN_QALLOC_VALID_MASK && j >= base_queue) if (val & I40E_PFLAN_QALLOC_VALID_MASK && j >= base_queue)
num_queues = (j - base_queue) + 1; num_queues = (j - base_queue) + 1;
else else
num_queues = 0; num_queues = 0;
val = rd32(hw, I40E_PF_VT_PFALLOC); val = rd32(hw, I40E_PF_VT_PFALLOC);
i = (val & I40E_PF_VT_PFALLOC_FIRSTVF_MASK) >> i = FIELD_GET(I40E_PF_VT_PFALLOC_FIRSTVF_MASK, val);
I40E_PF_VT_PFALLOC_FIRSTVF_SHIFT; j = FIELD_GET(I40E_PF_VT_PFALLOC_LASTVF_MASK, val);
j = (val & I40E_PF_VT_PFALLOC_LASTVF_MASK) >>
I40E_PF_VT_PFALLOC_LASTVF_SHIFT;
if (val & I40E_PF_VT_PFALLOC_VALID_MASK && j >= i) if (val & I40E_PF_VT_PFALLOC_VALID_MASK && j >= i)
num_vfs = (j - i) + 1; num_vfs = (j - i) + 1;
else else
@ -1194,8 +1187,7 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)
!hw->func_caps.led[idx]) !hw->func_caps.led[idx])
return 0; return 0;
gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx)); gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx));
port = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >> port = FIELD_GET(I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK, gpio_val);
I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT;
/* if PRT_NUM_NA is 1 then this LED is not port specific, OR /* if PRT_NUM_NA is 1 then this LED is not port specific, OR
* if it is not our port then ignore * if it is not our port then ignore
@ -1239,8 +1231,7 @@ u32 i40e_led_get(struct i40e_hw *hw)
if (!gpio_val) if (!gpio_val)
continue; continue;
mode = (gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) >> mode = FIELD_GET(I40E_GLGEN_GPIO_CTL_LED_MODE_MASK, gpio_val);
I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT;
break; break;
} }
@ -4190,8 +4181,7 @@ i40e_validate_filter_settings(struct i40e_hw *hw,
/* FCHSIZE + FCDSIZE should not be greater than PMFCOEFMAX */ /* FCHSIZE + FCDSIZE should not be greater than PMFCOEFMAX */
val = rd32(hw, I40E_GLHMC_FCOEFMAX); val = rd32(hw, I40E_GLHMC_FCOEFMAX);
fcoe_fmax = (val & I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_MASK) fcoe_fmax = FIELD_GET(I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_MASK, val);
>> I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_SHIFT;
if (fcoe_filt_size + fcoe_cntx_size > fcoe_fmax) if (fcoe_filt_size + fcoe_cntx_size > fcoe_fmax)
return -EINVAL; return -EINVAL;
@ -4646,8 +4636,7 @@ int i40e_read_phy_register_clause22(struct i40e_hw *hw,
"PHY: Can't write command to external PHY.\n"); "PHY: Can't write command to external PHY.\n");
} else { } else {
command = rd32(hw, I40E_GLGEN_MSRWD(port_num)); command = rd32(hw, I40E_GLGEN_MSRWD(port_num));
*value = (command & I40E_GLGEN_MSRWD_MDIRDDATA_MASK) >> *value = FIELD_GET(I40E_GLGEN_MSRWD_MDIRDDATA_MASK, command);
I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT;
} }
return status; return status;
@ -4756,8 +4745,7 @@ int i40e_read_phy_register_clause45(struct i40e_hw *hw,
if (!status) { if (!status) {
command = rd32(hw, I40E_GLGEN_MSRWD(port_num)); command = rd32(hw, I40E_GLGEN_MSRWD(port_num));
*value = (command & I40E_GLGEN_MSRWD_MDIRDDATA_MASK) >> *value = FIELD_GET(I40E_GLGEN_MSRWD_MDIRDDATA_MASK, command);
I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT;
} else { } else {
i40e_debug(hw, I40E_DEBUG_PHY, i40e_debug(hw, I40E_DEBUG_PHY,
"PHY: Can't read register value from external PHY.\n"); "PHY: Can't read register value from external PHY.\n");
@ -5902,9 +5890,8 @@ i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
u16 tnl_type; u16 tnl_type;
u32 ti; u32 ti;
tnl_type = (le16_to_cpu(filters[i].element.flags) & tnl_type = le16_get_bits(filters[i].element.flags,
I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK) >> I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK);
I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT;
/* Due to hardware eccentricities, the VNI for Geneve is shifted /* Due to hardware eccentricities, the VNI for Geneve is shifted
* one more byte further than normally used for Tenant ID in * one more byte further than normally used for Tenant ID in
@ -5996,9 +5983,8 @@ i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
u16 tnl_type; u16 tnl_type;
u32 ti; u32 ti;
tnl_type = (le16_to_cpu(filters[i].element.flags) & tnl_type = le16_get_bits(filters[i].element.flags,
I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK) >> I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK);
I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT;
/* Due to hardware eccentricities, the VNI for Geneve is shifted /* Due to hardware eccentricities, the VNI for Geneve is shifted
* one more byte further than normally used for Tenant ID in * one more byte further than normally used for Tenant ID in

158
drivers/net/ethernet/intel/i40e/i40e_dcb.c
View File

@ -22,8 +22,7 @@ int i40e_get_dcbx_status(struct i40e_hw *hw, u16 *status)
return -EINVAL; return -EINVAL;
reg = rd32(hw, I40E_PRTDCB_GENS); reg = rd32(hw, I40E_PRTDCB_GENS);
*status = (u16)((reg & I40E_PRTDCB_GENS_DCBX_STATUS_MASK) >> *status = FIELD_GET(I40E_PRTDCB_GENS_DCBX_STATUS_MASK, reg);
I40E_PRTDCB_GENS_DCBX_STATUS_SHIFT);
return 0; return 0;
} }
@ -52,12 +51,9 @@ static void i40e_parse_ieee_etscfg_tlv(struct i40e_lldp_org_tlv *tlv,
* |1bit | 1bit|3 bits|3bits| * |1bit | 1bit|3 bits|3bits|
*/ */
etscfg = &dcbcfg->etscfg; etscfg = &dcbcfg->etscfg;
etscfg->willing = (u8)((buf[offset] & I40E_IEEE_ETS_WILLING_MASK) >> etscfg->willing = FIELD_GET(I40E_IEEE_ETS_WILLING_MASK, buf[offset]);
I40E_IEEE_ETS_WILLING_SHIFT); etscfg->cbs = FIELD_GET(I40E_IEEE_ETS_CBS_MASK, buf[offset]);
etscfg->cbs = (u8)((buf[offset] & I40E_IEEE_ETS_CBS_MASK) >> etscfg->maxtcs = FIELD_GET(I40E_IEEE_ETS_MAXTC_MASK, buf[offset]);
I40E_IEEE_ETS_CBS_SHIFT);
etscfg->maxtcs = (u8)((buf[offset] & I40E_IEEE_ETS_MAXTC_MASK) >>
I40E_IEEE_ETS_MAXTC_SHIFT);
/* Move offset to Priority Assignment Table */ /* Move offset to Priority Assignment Table */
offset++; offset++;
@ -71,11 +67,9 @@ static void i40e_parse_ieee_etscfg_tlv(struct i40e_lldp_org_tlv *tlv,
* ----------------------------------------- * -----------------------------------------
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
priority = (u8)((buf[offset] & I40E_IEEE_ETS_PRIO_1_MASK) >> priority = FIELD_GET(I40E_IEEE_ETS_PRIO_1_MASK, buf[offset]);
I40E_IEEE_ETS_PRIO_1_SHIFT); etscfg->prioritytable[i * 2] = priority;
etscfg->prioritytable[i * 2] = priority; priority = FIELD_GET(I40E_IEEE_ETS_PRIO_0_MASK, buf[offset]);
priority = (u8)((buf[offset] & I40E_IEEE_ETS_PRIO_0_MASK) >>
I40E_IEEE_ETS_PRIO_0_SHIFT);
etscfg->prioritytable[i * 2 + 1] = priority; etscfg->prioritytable[i * 2 + 1] = priority;
offset++; offset++;
} }
@ -126,12 +120,10 @@ static void i40e_parse_ieee_etsrec_tlv(struct i40e_lldp_org_tlv *tlv,
* ----------------------------------------- * -----------------------------------------
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
priority = (u8)((buf[offset] & I40E_IEEE_ETS_PRIO_1_MASK) >> priority = FIELD_GET(I40E_IEEE_ETS_PRIO_1_MASK, buf[offset]);
I40E_IEEE_ETS_PRIO_1_SHIFT); dcbcfg->etsrec.prioritytable[i * 2] = priority;
dcbcfg->etsrec.prioritytable[i*2] = priority; priority = FIELD_GET(I40E_IEEE_ETS_PRIO_0_MASK, buf[offset]);
priority = (u8)((buf[offset] & I40E_IEEE_ETS_PRIO_0_MASK) >> dcbcfg->etsrec.prioritytable[(i * 2) + 1] = priority;
I40E_IEEE_ETS_PRIO_0_SHIFT);
dcbcfg->etsrec.prioritytable[i*2 + 1] = priority;
offset++; offset++;
} }
@ -172,12 +164,9 @@ static void i40e_parse_ieee_pfccfg_tlv(struct i40e_lldp_org_tlv *tlv,
* ----------------------------------------- * -----------------------------------------
* |1bit | 1bit|2 bits|4bits| 1 octet | * |1bit | 1bit|2 bits|4bits| 1 octet |
*/ */
dcbcfg->pfc.willing = (u8)((buf[0] & I40E_IEEE_PFC_WILLING_MASK) >> dcbcfg->pfc.willing = FIELD_GET(I40E_IEEE_PFC_WILLING_MASK, buf[0]);
I40E_IEEE_PFC_WILLING_SHIFT); dcbcfg->pfc.mbc = FIELD_GET(I40E_IEEE_PFC_MBC_MASK, buf[0]);
dcbcfg->pfc.mbc = (u8)((buf[0] & I40E_IEEE_PFC_MBC_MASK) >> dcbcfg->pfc.pfccap = FIELD_GET(I40E_IEEE_PFC_CAP_MASK, buf[0]);
I40E_IEEE_PFC_MBC_SHIFT);
dcbcfg->pfc.pfccap = (u8)((buf[0] & I40E_IEEE_PFC_CAP_MASK) >>
I40E_IEEE_PFC_CAP_SHIFT);
dcbcfg->pfc.pfcenable = buf[1]; dcbcfg->pfc.pfcenable = buf[1];
} }
@ -198,8 +187,7 @@ static void i40e_parse_ieee_app_tlv(struct i40e_lldp_org_tlv *tlv,
u8 *buf; u8 *buf;
typelength = ntohs(tlv->typelength); typelength = ntohs(tlv->typelength);
length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >> length = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
I40E_LLDP_TLV_LEN_SHIFT);
buf = tlv->tlvinfo; buf = tlv->tlvinfo;
/* The App priority table starts 5 octets after TLV header */ /* The App priority table starts 5 octets after TLV header */
@ -217,12 +205,10 @@ static void i40e_parse_ieee_app_tlv(struct i40e_lldp_org_tlv *tlv,
* ----------------------------------------- * -----------------------------------------
*/ */
while (offset < length) { while (offset < length) {
dcbcfg->app[i].priority = (u8)((buf[offset] & dcbcfg->app[i].priority = FIELD_GET(I40E_IEEE_APP_PRIO_MASK,
I40E_IEEE_APP_PRIO_MASK) >> buf[offset]);
I40E_IEEE_APP_PRIO_SHIFT); dcbcfg->app[i].selector = FIELD_GET(I40E_IEEE_APP_SEL_MASK,
dcbcfg->app[i].selector = (u8)((buf[offset] & buf[offset]);
I40E_IEEE_APP_SEL_MASK) >>
I40E_IEEE_APP_SEL_SHIFT);
dcbcfg->app[i].protocolid = (buf[offset + 1] << 0x8) | dcbcfg->app[i].protocolid = (buf[offset + 1] << 0x8) |
buf[offset + 2]; buf[offset + 2];
/* Move to next app */ /* Move to next app */
@ -250,8 +236,7 @@ static void i40e_parse_ieee_tlv(struct i40e_lldp_org_tlv *tlv,
u8 subtype; u8 subtype;
ouisubtype = ntohl(tlv->ouisubtype); ouisubtype = ntohl(tlv->ouisubtype);
subtype = (u8)((ouisubtype & I40E_LLDP_TLV_SUBTYPE_MASK) >> subtype = FIELD_GET(I40E_LLDP_TLV_SUBTYPE_MASK, ouisubtype);
I40E_LLDP_TLV_SUBTYPE_SHIFT);
switch (subtype) { switch (subtype) {
case I40E_IEEE_SUBTYPE_ETS_CFG: case I40E_IEEE_SUBTYPE_ETS_CFG:
i40e_parse_ieee_etscfg_tlv(tlv, dcbcfg); i40e_parse_ieee_etscfg_tlv(tlv, dcbcfg);
@ -301,11 +286,9 @@ static void i40e_parse_cee_pgcfg_tlv(struct i40e_cee_feat_tlv *tlv,
* ----------------------------------------- * -----------------------------------------
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
priority = (u8)((buf[offset] & I40E_CEE_PGID_PRIO_1_MASK) >> priority = FIELD_GET(I40E_CEE_PGID_PRIO_1_MASK, buf[offset]);
I40E_CEE_PGID_PRIO_1_SHIFT); etscfg->prioritytable[i * 2] = priority;
etscfg->prioritytable[i * 2] = priority; priority = FIELD_GET(I40E_CEE_PGID_PRIO_0_MASK, buf[offset]);
priority = (u8)((buf[offset] & I40E_CEE_PGID_PRIO_0_MASK) >>
I40E_CEE_PGID_PRIO_0_SHIFT);
etscfg->prioritytable[i * 2 + 1] = priority; etscfg->prioritytable[i * 2 + 1] = priority;
offset++; offset++;
} }
@ -362,8 +345,7 @@ static void i40e_parse_cee_app_tlv(struct i40e_cee_feat_tlv *tlv,
u8 i; u8 i;
typelength = ntohs(tlv->hdr.typelen); typelength = ntohs(tlv->hdr.typelen);
length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >> length = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
I40E_LLDP_TLV_LEN_SHIFT);
dcbcfg->numapps = length / sizeof(*app); dcbcfg->numapps = length / sizeof(*app);
@ -419,15 +401,13 @@ static void i40e_parse_cee_tlv(struct i40e_lldp_org_tlv *tlv,
u32 ouisubtype; u32 ouisubtype;
ouisubtype = ntohl(tlv->ouisubtype); ouisubtype = ntohl(tlv->ouisubtype);
subtype = (u8)((ouisubtype & I40E_LLDP_TLV_SUBTYPE_MASK) >> subtype = FIELD_GET(I40E_LLDP_TLV_SUBTYPE_MASK, ouisubtype);
I40E_LLDP_TLV_SUBTYPE_SHIFT);
/* Return if not CEE DCBX */ /* Return if not CEE DCBX */
if (subtype != I40E_CEE_DCBX_TYPE) if (subtype != I40E_CEE_DCBX_TYPE)
return; return;
typelength = ntohs(tlv->typelength); typelength = ntohs(tlv->typelength);
tlvlen = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >> tlvlen = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
I40E_LLDP_TLV_LEN_SHIFT);
len = sizeof(tlv->typelength) + sizeof(ouisubtype) + len = sizeof(tlv->typelength) + sizeof(ouisubtype) +
sizeof(struct i40e_cee_ctrl_tlv); sizeof(struct i40e_cee_ctrl_tlv);
/* Return if no CEE DCBX Feature TLVs */ /* Return if no CEE DCBX Feature TLVs */
@ -437,11 +417,8 @@ static void i40e_parse_cee_tlv(struct i40e_lldp_org_tlv *tlv,
sub_tlv = (struct i40e_cee_feat_tlv *)((char *)tlv + len); sub_tlv = (struct i40e_cee_feat_tlv *)((char *)tlv + len);
while (feat_tlv_count < I40E_CEE_MAX_FEAT_TYPE) { while (feat_tlv_count < I40E_CEE_MAX_FEAT_TYPE) {
typelength = ntohs(sub_tlv->hdr.typelen); typelength = ntohs(sub_tlv->hdr.typelen);
sublen = (u16)((typelength & sublen = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
I40E_LLDP_TLV_LEN_MASK) >> subtype = FIELD_GET(I40E_LLDP_TLV_TYPE_MASK, typelength);
I40E_LLDP_TLV_LEN_SHIFT);
subtype = (u8)((typelength & I40E_LLDP_TLV_TYPE_MASK) >>
I40E_LLDP_TLV_TYPE_SHIFT);
switch (subtype) { switch (subtype) {
case I40E_CEE_SUBTYPE_PG_CFG: case I40E_CEE_SUBTYPE_PG_CFG:
i40e_parse_cee_pgcfg_tlv(sub_tlv, dcbcfg); i40e_parse_cee_pgcfg_tlv(sub_tlv, dcbcfg);
@ -478,8 +455,7 @@ static void i40e_parse_org_tlv(struct i40e_lldp_org_tlv *tlv,
u32 oui; u32 oui;
ouisubtype = ntohl(tlv->ouisubtype); ouisubtype = ntohl(tlv->ouisubtype);
oui = (u32)((ouisubtype & I40E_LLDP_TLV_OUI_MASK) >> oui = FIELD_GET(I40E_LLDP_TLV_OUI_MASK, ouisubtype);
I40E_LLDP_TLV_OUI_SHIFT);
switch (oui) { switch (oui) {
case I40E_IEEE_8021QAZ_OUI: case I40E_IEEE_8021QAZ_OUI:
i40e_parse_ieee_tlv(tlv, dcbcfg); i40e_parse_ieee_tlv(tlv, dcbcfg);
@ -517,10 +493,8 @@ int i40e_lldp_to_dcb_config(u8 *lldpmib,
tlv = (struct i40e_lldp_org_tlv *)lldpmib; tlv = (struct i40e_lldp_org_tlv *)lldpmib;
while (1) { while (1) {
typelength = ntohs(tlv->typelength); typelength = ntohs(tlv->typelength);
type = (u16)((typelength & I40E_LLDP_TLV_TYPE_MASK) >> type = FIELD_GET(I40E_LLDP_TLV_TYPE_MASK, typelength);
I40E_LLDP_TLV_TYPE_SHIFT); length = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >>
I40E_LLDP_TLV_LEN_SHIFT);
offset += sizeof(typelength) + length; offset += sizeof(typelength) + length;
/* END TLV or beyond LLDPDU size */ /* END TLV or beyond LLDPDU size */
@ -594,7 +568,7 @@ static void i40e_cee_to_dcb_v1_config(
{ {
u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status); u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status);
u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio); u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);
u8 i, tc, err; u8 i, err;
/* CEE PG data to ETS config */ /* CEE PG data to ETS config */
dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc; dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
@ -603,13 +577,13 @@ static void i40e_cee_to_dcb_v1_config(
* from those in the CEE Priority Group sub-TLV. * from those in the CEE Priority Group sub-TLV.
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
tc = (u8)((cee_cfg->oper_prio_tc[i] & u8 tc;
I40E_CEE_PGID_PRIO_0_MASK) >>
I40E_CEE_PGID_PRIO_0_SHIFT); tc = FIELD_GET(I40E_CEE_PGID_PRIO_0_MASK,
dcbcfg->etscfg.prioritytable[i * 2] = tc; cee_cfg->oper_prio_tc[i]);
tc = (u8)((cee_cfg->oper_prio_tc[i] & dcbcfg->etscfg.prioritytable[i * 2] = tc;
I40E_CEE_PGID_PRIO_1_MASK) >> tc = FIELD_GET(I40E_CEE_PGID_PRIO_1_MASK,
I40E_CEE_PGID_PRIO_1_SHIFT); cee_cfg->oper_prio_tc[i]);
dcbcfg->etscfg.prioritytable[i*2 + 1] = tc; dcbcfg->etscfg.prioritytable[i*2 + 1] = tc;
} }
@ -631,8 +605,7 @@ static void i40e_cee_to_dcb_v1_config(
dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en; dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en;
dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS; dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;
status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >> status = FIELD_GET(I40E_AQC_CEE_APP_STATUS_MASK, tlv_status);
I40E_AQC_CEE_APP_STATUS_SHIFT;
err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
/* Add APPs if Error is False */ /* Add APPs if Error is False */
if (!err) { if (!err) {
@ -641,22 +614,19 @@ static void i40e_cee_to_dcb_v1_config(
/* FCoE APP */ /* FCoE APP */
dcbcfg->app[0].priority = dcbcfg->app[0].priority =
(app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_FCOE_MASK, app_prio);
I40E_AQC_CEE_APP_FCOE_SHIFT;
dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE; dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE;
dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE; dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;
/* iSCSI APP */ /* iSCSI APP */
dcbcfg->app[1].priority = dcbcfg->app[1].priority =
(app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_ISCSI_MASK, app_prio);
I40E_AQC_CEE_APP_ISCSI_SHIFT;
dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP; dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP;
dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI; dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI;
/* FIP APP */ /* FIP APP */
dcbcfg->app[2].priority = dcbcfg->app[2].priority =
(app_prio & I40E_AQC_CEE_APP_FIP_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_FIP_MASK, app_prio);
I40E_AQC_CEE_APP_FIP_SHIFT;
dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE; dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE;
dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP; dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP;
} }
@ -675,7 +645,7 @@ static void i40e_cee_to_dcb_config(
{ {
u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status); u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);
u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio); u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);
u8 i, tc, err, sync, oper; u8 i, err, sync, oper;
/* CEE PG data to ETS config */ /* CEE PG data to ETS config */
dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc; dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
@ -684,13 +654,13 @@ static void i40e_cee_to_dcb_config(
* from those in the CEE Priority Group sub-TLV. * from those in the CEE Priority Group sub-TLV.
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
tc = (u8)((cee_cfg->oper_prio_tc[i] & u8 tc;
I40E_CEE_PGID_PRIO_0_MASK) >>
I40E_CEE_PGID_PRIO_0_SHIFT); tc = FIELD_GET(I40E_CEE_PGID_PRIO_0_MASK,
dcbcfg->etscfg.prioritytable[i * 2] = tc; cee_cfg->oper_prio_tc[i]);
tc = (u8)((cee_cfg->oper_prio_tc[i] & dcbcfg->etscfg.prioritytable[i * 2] = tc;
I40E_CEE_PGID_PRIO_1_MASK) >> tc = FIELD_GET(I40E_CEE_PGID_PRIO_1_MASK,
I40E_CEE_PGID_PRIO_1_SHIFT); cee_cfg->oper_prio_tc[i]);
dcbcfg->etscfg.prioritytable[i * 2 + 1] = tc; dcbcfg->etscfg.prioritytable[i * 2 + 1] = tc;
} }
@ -713,8 +683,7 @@ static void i40e_cee_to_dcb_config(
dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS; dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;
i = 0; i = 0;
status = (tlv_status & I40E_AQC_CEE_FCOE_STATUS_MASK) >> status = FIELD_GET(I40E_AQC_CEE_FCOE_STATUS_MASK, tlv_status);
I40E_AQC_CEE_FCOE_STATUS_SHIFT;
err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0; sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0; oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
@ -722,15 +691,13 @@ static void i40e_cee_to_dcb_config(
if (!err && sync && oper) { if (!err && sync && oper) {
/* FCoE APP */ /* FCoE APP */
dcbcfg->app[i].priority = dcbcfg->app[i].priority =
(app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_FCOE_MASK, app_prio);
I40E_AQC_CEE_APP_FCOE_SHIFT;
dcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE; dcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE;
dcbcfg->app[i].protocolid = I40E_APP_PROTOID_FCOE; dcbcfg->app[i].protocolid = I40E_APP_PROTOID_FCOE;
i++; i++;
} }
status = (tlv_status & I40E_AQC_CEE_ISCSI_STATUS_MASK) >> status = FIELD_GET(I40E_AQC_CEE_ISCSI_STATUS_MASK, tlv_status);
I40E_AQC_CEE_ISCSI_STATUS_SHIFT;
err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0; sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0; oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
@ -738,15 +705,13 @@ static void i40e_cee_to_dcb_config(
if (!err && sync && oper) { if (!err && sync && oper) {
/* iSCSI APP */ /* iSCSI APP */
dcbcfg->app[i].priority = dcbcfg->app[i].priority =
(app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_ISCSI_MASK, app_prio);
I40E_AQC_CEE_APP_ISCSI_SHIFT;
dcbcfg->app[i].selector = I40E_APP_SEL_TCPIP; dcbcfg->app[i].selector = I40E_APP_SEL_TCPIP;
dcbcfg->app[i].protocolid = I40E_APP_PROTOID_ISCSI; dcbcfg->app[i].protocolid = I40E_APP_PROTOID_ISCSI;
i++; i++;
} }
status = (tlv_status & I40E_AQC_CEE_FIP_STATUS_MASK) >> status = FIELD_GET(I40E_AQC_CEE_FIP_STATUS_MASK, tlv_status);
I40E_AQC_CEE_FIP_STATUS_SHIFT;
err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0; sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0; oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
@ -754,8 +719,7 @@ static void i40e_cee_to_dcb_config(
if (!err && sync && oper) { if (!err && sync && oper) {
/* FIP APP */ /* FIP APP */
dcbcfg->app[i].priority = dcbcfg->app[i].priority =
(app_prio & I40E_AQC_CEE_APP_FIP_MASK) >> FIELD_GET(I40E_AQC_CEE_APP_FIP_MASK, app_prio);
I40E_AQC_CEE_APP_FIP_SHIFT;
dcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE; dcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE;
dcbcfg->app[i].protocolid = I40E_APP_PROTOID_FIP; dcbcfg->app[i].protocolid = I40E_APP_PROTOID_FIP;
i++; i++;
@ -1188,7 +1152,7 @@ static void i40e_add_ieee_app_pri_tlv(struct i40e_lldp_org_tlv *tlv,
selector = dcbcfg->app[i].selector & 0x7; selector = dcbcfg->app[i].selector & 0x7;
buf[offset] = (priority << I40E_IEEE_APP_PRIO_SHIFT) | selector; buf[offset] = (priority << I40E_IEEE_APP_PRIO_SHIFT) | selector;
buf[offset + 1] = (dcbcfg->app[i].protocolid >> 0x8) & 0xFF; buf[offset + 1] = (dcbcfg->app[i].protocolid >> 0x8) & 0xFF;
buf[offset + 2] = dcbcfg->app[i].protocolid & 0xFF; buf[offset + 2] = dcbcfg->app[i].protocolid & 0xFF;
/* Move to next app */ /* Move to next app */
offset += 3; offset += 3;
i++; i++;
@ -1284,8 +1248,7 @@ int i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen,
do { do {
i40e_add_dcb_tlv(tlv, dcbcfg, tlvid++); i40e_add_dcb_tlv(tlv, dcbcfg, tlvid++);
typelength = ntohs(tlv->typelength); typelength = ntohs(tlv->typelength);
length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >> length = FIELD_GET(I40E_LLDP_TLV_LEN_MASK, typelength);
I40E_LLDP_TLV_LEN_SHIFT);
if (length) if (length)
offset += length + I40E_IEEE_TLV_HEADER_LENGTH; offset += length + I40E_IEEE_TLV_HEADER_LENGTH;
/* END TLV or beyond LLDPDU size */ /* END TLV or beyond LLDPDU size */
@ -1537,8 +1500,7 @@ u8 i40e_dcb_hw_get_num_tc(struct i40e_hw *hw)
{ {
u32 reg = rd32(hw, I40E_PRTDCB_GENC); u32 reg = rd32(hw, I40E_PRTDCB_GENC);
return (u8)((reg & I40E_PRTDCB_GENC_NUMTC_MASK) >> return FIELD_GET(I40E_PRTDCB_GENC_NUMTC_MASK, reg);
I40E_PRTDCB_GENC_NUMTC_SHIFT);
} }
/** /**

3
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
View File

@ -21,8 +21,7 @@ static void i40e_get_pfc_delay(struct i40e_hw *hw, u16 *delay)
u32 val; u32 val;
val = rd32(hw, I40E_PRTDCB_GENC); val = rd32(hw, I40E_PRTDCB_GENC);
*delay = (u16)((val & I40E_PRTDCB_GENC_PFCLDA_MASK) >> *delay = FIELD_GET(I40E_PRTDCB_GENC_PFCLDA_MASK, val);
I40E_PRTDCB_GENC_PFCLDA_SHIFT);
} }
/** /**

4
drivers/net/ethernet/intel/i40e/i40e_ddp.c
View File

@ -81,8 +81,8 @@ static int i40e_ddp_does_profile_exist(struct i40e_hw *hw,
static bool i40e_ddp_profiles_overlap(struct i40e_profile_info *new, static bool i40e_ddp_profiles_overlap(struct i40e_profile_info *new,
struct i40e_profile_info *old) struct i40e_profile_info *old)
{ {
unsigned int group_id_old = (u8)((old->track_id & 0x00FF0000) >> 16); unsigned int group_id_old = FIELD_GET(0x00FF0000, old->track_id);
unsigned int group_id_new = (u8)((new->track_id & 0x00FF0000) >> 16); unsigned int group_id_new = FIELD_GET(0x00FF0000, new->track_id);
/* 0x00 group must be only the first */ /* 0x00 group must be only the first */
if (group_id_new == 0) if (group_id_new == 0)

7
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@ -1952,9 +1952,8 @@ static int i40e_get_eeprom_len(struct net_device *netdev)
val = X722_EEPROM_SCOPE_LIMIT + 1; val = X722_EEPROM_SCOPE_LIMIT + 1;
return val; return val;
} }
val = (rd32(hw, I40E_GLPCI_LBARCTRL) val = FIELD_GET(I40E_GLPCI_LBARCTRL_FL_SIZE_MASK,
& I40E_GLPCI_LBARCTRL_FL_SIZE_MASK) rd32(hw, I40E_GLPCI_LBARCTRL));
>> I40E_GLPCI_LBARCTRL_FL_SIZE_SHIFT;
/* register returns value in power of 2, 64Kbyte chunks. */ /* register returns value in power of 2, 64Kbyte chunks. */
val = (64 * 1024) * BIT(val); val = (64 * 1024) * BIT(val);
return val; return val;
@ -3284,7 +3283,7 @@ static int i40e_parse_rx_flow_user_data(struct ethtool_rx_flow_spec *fsp,
} else if (valid) { } else if (valid) {
data->flex_word = value & I40E_USERDEF_FLEX_WORD; data->flex_word = value & I40E_USERDEF_FLEX_WORD;
data->flex_offset = data->flex_offset =
(value & I40E_USERDEF_FLEX_OFFSET) >> 16; FIELD_GET(I40E_USERDEF_FLEX_OFFSET, value);
data->flex_filter = true; data->flex_filter = true;
} }

73
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -1197,11 +1197,9 @@ static void i40e_update_pf_stats(struct i40e_pf *pf)
val = rd32(hw, I40E_PRTPM_EEE_STAT); val = rd32(hw, I40E_PRTPM_EEE_STAT);
nsd->tx_lpi_status = nsd->tx_lpi_status =
(val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >> FIELD_GET(I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK, val);
I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT;
nsd->rx_lpi_status = nsd->rx_lpi_status =
(val & I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK) >> FIELD_GET(I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK, val);
I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT;
i40e_stat_update32(hw, I40E_PRTPM_TLPIC, i40e_stat_update32(hw, I40E_PRTPM_TLPIC,
pf->stat_offsets_loaded, pf->stat_offsets_loaded,
&osd->tx_lpi_count, &nsd->tx_lpi_count); &osd->tx_lpi_count, &nsd->tx_lpi_count);
@ -4340,8 +4338,7 @@ static irqreturn_t i40e_intr(int irq, void *data)
set_bit(__I40E_RESET_INTR_RECEIVED, pf->state); set_bit(__I40E_RESET_INTR_RECEIVED, pf->state);
ena_mask &= ~I40E_PFINT_ICR0_ENA_GRST_MASK; ena_mask &= ~I40E_PFINT_ICR0_ENA_GRST_MASK;
val = rd32(hw, I40E_GLGEN_RSTAT); val = rd32(hw, I40E_GLGEN_RSTAT);
val = (val & I40E_GLGEN_RSTAT_RESET_TYPE_MASK) val = FIELD_GET(I40E_GLGEN_RSTAT_RESET_TYPE_MASK, val);
>> I40E_GLGEN_RSTAT_RESET_TYPE_SHIFT;
if (val == I40E_RESET_CORER) { if (val == I40E_RESET_CORER) {
pf->corer_count++; pf->corer_count++;
} else if (val == I40E_RESET_GLOBR) { } else if (val == I40E_RESET_GLOBR) {
@ -5003,8 +5000,8 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
* next_q field of the registers. * next_q field of the registers.
*/ */
val = rd32(hw, I40E_PFINT_LNKLSTN(vector - 1)); val = rd32(hw, I40E_PFINT_LNKLSTN(vector - 1));
qp = (val & I40E_PFINT_LNKLSTN_FIRSTQ_INDX_MASK) qp = FIELD_GET(I40E_PFINT_LNKLSTN_FIRSTQ_INDX_MASK,
>> I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT; val);
val |= I40E_QUEUE_END_OF_LIST val |= I40E_QUEUE_END_OF_LIST
<< I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT; << I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT;
wr32(hw, I40E_PFINT_LNKLSTN(vector - 1), val); wr32(hw, I40E_PFINT_LNKLSTN(vector - 1), val);
@ -5026,8 +5023,8 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
val = rd32(hw, I40E_QINT_TQCTL(qp)); val = rd32(hw, I40E_QINT_TQCTL(qp));
next = (val & I40E_QINT_TQCTL_NEXTQ_INDX_MASK) next = FIELD_GET(I40E_QINT_TQCTL_NEXTQ_INDX_MASK,
>> I40E_QINT_TQCTL_NEXTQ_INDX_SHIFT; val);
val &= ~(I40E_QINT_TQCTL_MSIX_INDX_MASK | val &= ~(I40E_QINT_TQCTL_MSIX_INDX_MASK |
I40E_QINT_TQCTL_MSIX0_INDX_MASK | I40E_QINT_TQCTL_MSIX0_INDX_MASK |
@ -5045,8 +5042,7 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
free_irq(pf->pdev->irq, pf); free_irq(pf->pdev->irq, pf);
val = rd32(hw, I40E_PFINT_LNKLST0); val = rd32(hw, I40E_PFINT_LNKLST0);
qp = (val & I40E_PFINT_LNKLSTN_FIRSTQ_INDX_MASK) qp = FIELD_GET(I40E_PFINT_LNKLSTN_FIRSTQ_INDX_MASK, val);
>> I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT;
val |= I40E_QUEUE_END_OF_LIST val |= I40E_QUEUE_END_OF_LIST
<< I40E_PFINT_LNKLST0_FIRSTQ_INDX_SHIFT; << I40E_PFINT_LNKLST0_FIRSTQ_INDX_SHIFT;
wr32(hw, I40E_PFINT_LNKLST0, val); wr32(hw, I40E_PFINT_LNKLST0, val);
@ -9549,18 +9545,18 @@ static void i40e_handle_lan_overflow_event(struct i40e_pf *pf,
dev_dbg(&pf->pdev->dev, "overflow Rx Queue Number = %d QTX_CTL=0x%08x\n", dev_dbg(&pf->pdev->dev, "overflow Rx Queue Number = %d QTX_CTL=0x%08x\n",
queue, qtx_ctl); queue, qtx_ctl);
if (FIELD_GET(I40E_QTX_CTL_PFVF_Q_MASK, qtx_ctl) !=
I40E_QTX_CTL_VF_QUEUE)
return;
/* Queue belongs to VF, find the VF and issue VF reset */ /* Queue belongs to VF, find the VF and issue VF reset */
if (((qtx_ctl & I40E_QTX_CTL_PFVF_Q_MASK) vf_id = FIELD_GET(I40E_QTX_CTL_VFVM_INDX_MASK, qtx_ctl);
>> I40E_QTX_CTL_PFVF_Q_SHIFT) == I40E_QTX_CTL_VF_QUEUE) { vf_id -= hw->func_caps.vf_base_id;
vf_id = (u16)((qtx_ctl & I40E_QTX_CTL_VFVM_INDX_MASK) vf = &pf->vf[vf_id];
>> I40E_QTX_CTL_VFVM_INDX_SHIFT); i40e_vc_notify_vf_reset(vf);
vf_id -= hw->func_caps.vf_base_id; /* Allow VF to process pending reset notification */
vf = &pf->vf[vf_id]; msleep(20);
i40e_vc_notify_vf_reset(vf); i40e_reset_vf(vf, false);
/* Allow VF to process pending reset notification */
msleep(20);
i40e_reset_vf(vf, false);
}
} }
/** /**
@ -9586,8 +9582,7 @@ u32 i40e_get_current_fd_count(struct i40e_pf *pf)
val = rd32(&pf->hw, I40E_PFQF_FDSTAT); val = rd32(&pf->hw, I40E_PFQF_FDSTAT);
fcnt_prog = (val & I40E_PFQF_FDSTAT_GUARANT_CNT_MASK) + fcnt_prog = (val & I40E_PFQF_FDSTAT_GUARANT_CNT_MASK) +
((val & I40E_PFQF_FDSTAT_BEST_CNT_MASK) >> FIELD_GET(I40E_PFQF_FDSTAT_BEST_CNT_MASK, val);
I40E_PFQF_FDSTAT_BEST_CNT_SHIFT);
return fcnt_prog; return fcnt_prog;
} }
@ -9601,8 +9596,7 @@ u32 i40e_get_global_fd_count(struct i40e_pf *pf)
val = rd32(&pf->hw, I40E_GLQF_FDCNT_0); val = rd32(&pf->hw, I40E_GLQF_FDCNT_0);
fcnt_prog = (val & I40E_GLQF_FDCNT_0_GUARANT_CNT_MASK) + fcnt_prog = (val & I40E_GLQF_FDCNT_0_GUARANT_CNT_MASK) +
((val & I40E_GLQF_FDCNT_0_BESTCNT_MASK) >> FIELD_GET(I40E_GLQF_FDCNT_0_BESTCNT_MASK, val);
I40E_GLQF_FDCNT_0_BESTCNT_SHIFT);
return fcnt_prog; return fcnt_prog;
} }
@ -11184,14 +11178,10 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)
/* find what triggered the MDD event */ /* find what triggered the MDD event */
reg = rd32(hw, I40E_GL_MDET_TX); reg = rd32(hw, I40E_GL_MDET_TX);
if (reg & I40E_GL_MDET_TX_VALID_MASK) { if (reg & I40E_GL_MDET_TX_VALID_MASK) {
u8 pf_num = (reg & I40E_GL_MDET_TX_PF_NUM_MASK) >> u8 pf_num = FIELD_GET(I40E_GL_MDET_TX_PF_NUM_MASK, reg);
I40E_GL_MDET_TX_PF_NUM_SHIFT; u16 vf_num = FIELD_GET(I40E_GL_MDET_TX_VF_NUM_MASK, reg);
u16 vf_num = (reg & I40E_GL_MDET_TX_VF_NUM_MASK) >> u8 event = FIELD_GET(I40E_GL_MDET_TX_EVENT_MASK, reg);
I40E_GL_MDET_TX_VF_NUM_SHIFT; u16 queue = FIELD_GET(I40E_GL_MDET_TX_QUEUE_MASK, reg) -
u8 event = (reg & I40E_GL_MDET_TX_EVENT_MASK) >>
I40E_GL_MDET_TX_EVENT_SHIFT;
u16 queue = ((reg & I40E_GL_MDET_TX_QUEUE_MASK) >>
I40E_GL_MDET_TX_QUEUE_SHIFT) -
pf->hw.func_caps.base_queue; pf->hw.func_caps.base_queue;
if (netif_msg_tx_err(pf)) if (netif_msg_tx_err(pf))
dev_info(&pf->pdev->dev, "Malicious Driver Detection event 0x%02x on TX queue %d PF number 0x%02x VF number 0x%02x\n", dev_info(&pf->pdev->dev, "Malicious Driver Detection event 0x%02x on TX queue %d PF number 0x%02x VF number 0x%02x\n",
@ -11201,12 +11191,9 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)
} }
reg = rd32(hw, I40E_GL_MDET_RX); reg = rd32(hw, I40E_GL_MDET_RX);
if (reg & I40E_GL_MDET_RX_VALID_MASK) { if (reg & I40E_GL_MDET_RX_VALID_MASK) {
u8 func = (reg & I40E_GL_MDET_RX_FUNCTION_MASK) >> u8 func = FIELD_GET(I40E_GL_MDET_RX_FUNCTION_MASK, reg);
I40E_GL_MDET_RX_FUNCTION_SHIFT; u8 event = FIELD_GET(I40E_GL_MDET_RX_EVENT_MASK, reg);
u8 event = (reg & I40E_GL_MDET_RX_EVENT_MASK) >> u16 queue = FIELD_GET(I40E_GL_MDET_RX_QUEUE_MASK, reg) -
I40E_GL_MDET_RX_EVENT_SHIFT;
u16 queue = ((reg & I40E_GL_MDET_RX_QUEUE_MASK) >>
I40E_GL_MDET_RX_QUEUE_SHIFT) -
pf->hw.func_caps.base_queue; pf->hw.func_caps.base_queue;
if (netif_msg_rx_err(pf)) if (netif_msg_rx_err(pf))
dev_info(&pf->pdev->dev, "Malicious Driver Detection event 0x%02x on RX queue %d of function 0x%02x\n", dev_info(&pf->pdev->dev, "Malicious Driver Detection event 0x%02x on RX queue %d of function 0x%02x\n",
@ -16170,8 +16157,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* make sure the MFS hasn't been set lower than the default */ /* make sure the MFS hasn't been set lower than the default */
#define MAX_FRAME_SIZE_DEFAULT 0x2600 #define MAX_FRAME_SIZE_DEFAULT 0x2600
val = (rd32(&pf->hw, I40E_PRTGL_SAH) & val = FIELD_GET(I40E_PRTGL_SAH_MFS_MASK,
I40E_PRTGL_SAH_MFS_MASK) >> I40E_PRTGL_SAH_MFS_SHIFT; rd32(&pf->hw, I40E_PRTGL_SAH));
if (val < MAX_FRAME_SIZE_DEFAULT) if (val < MAX_FRAME_SIZE_DEFAULT)
dev_warn(&pdev->dev, "MFS for port %x has been set below the default: %x\n", dev_warn(&pdev->dev, "MFS for port %x has been set below the default: %x\n",
pf->hw.port, val); pf->hw.port, val);

13
drivers/net/ethernet/intel/i40e/i40e_nvm.c
View File

@ -27,8 +27,7 @@ int i40e_init_nvm(struct i40e_hw *hw)
* as the blank mode may be used in the factory line. * as the blank mode may be used in the factory line.
*/ */
gens = rd32(hw, I40E_GLNVM_GENS); gens = rd32(hw, I40E_GLNVM_GENS);
sr_size = ((gens & I40E_GLNVM_GENS_SR_SIZE_MASK) >> sr_size = FIELD_GET(I40E_GLNVM_GENS_SR_SIZE_MASK, gens);
I40E_GLNVM_GENS_SR_SIZE_SHIFT);
/* Switching to words (sr_size contains power of 2KB) */ /* Switching to words (sr_size contains power of 2KB) */
nvm->sr_size = BIT(sr_size) * I40E_SR_WORDS_IN_1KB; nvm->sr_size = BIT(sr_size) * I40E_SR_WORDS_IN_1KB;
@ -194,9 +193,8 @@ static int i40e_read_nvm_word_srctl(struct i40e_hw *hw, u16 offset,
ret_code = i40e_poll_sr_srctl_done_bit(hw); ret_code = i40e_poll_sr_srctl_done_bit(hw);
if (!ret_code) { if (!ret_code) {
sr_reg = rd32(hw, I40E_GLNVM_SRDATA); sr_reg = rd32(hw, I40E_GLNVM_SRDATA);
*data = (u16)((sr_reg & *data = FIELD_GET(I40E_GLNVM_SRDATA_RDDATA_MASK,
I40E_GLNVM_SRDATA_RDDATA_MASK) sr_reg);
>> I40E_GLNVM_SRDATA_RDDATA_SHIFT);
} }
} }
if (ret_code) if (ret_code)
@ -772,13 +770,12 @@ static inline u8 i40e_nvmupd_get_module(u32 val)
} }
static inline u8 i40e_nvmupd_get_transaction(u32 val) static inline u8 i40e_nvmupd_get_transaction(u32 val)
{ {
return (u8)((val & I40E_NVM_TRANS_MASK) >> I40E_NVM_TRANS_SHIFT); return FIELD_GET(I40E_NVM_TRANS_MASK, val);
} }
static inline u8 i40e_nvmupd_get_preservation_flags(u32 val) static inline u8 i40e_nvmupd_get_preservation_flags(u32 val)
{ {
return (u8)((val & I40E_NVM_PRESERVATION_FLAGS_MASK) >> return FIELD_GET(I40E_NVM_PRESERVATION_FLAGS_MASK, val);
I40E_NVM_PRESERVATION_FLAGS_SHIFT);
} }
static const char * const i40e_nvm_update_state_str[] = { static const char * const i40e_nvm_update_state_str[] = {

4
drivers/net/ethernet/intel/i40e/i40e_ptp.c
View File

@ -1480,8 +1480,8 @@ void i40e_ptp_init(struct i40e_pf *pf)
/* Only one PF is assigned to control 1588 logic per port. Do not /* Only one PF is assigned to control 1588 logic per port. Do not
* enable any support for PFs not assigned via PRTTSYN_CTL0.PF_ID * enable any support for PFs not assigned via PRTTSYN_CTL0.PF_ID
*/ */
pf_id = (rd32(hw, I40E_PRTTSYN_CTL0) & I40E_PRTTSYN_CTL0_PF_ID_MASK) >> pf_id = FIELD_GET(I40E_PRTTSYN_CTL0_PF_ID_MASK,
I40E_PRTTSYN_CTL0_PF_ID_SHIFT; rd32(hw, I40E_PRTTSYN_CTL0));
if (hw->pf_id != pf_id) { if (hw->pf_id != pf_id) {
clear_bit(I40E_FLAG_PTP_ENA, pf->flags); clear_bit(I40E_FLAG_PTP_ENA, pf->flags);
dev_info(&pf->pdev->dev, "%s: PTP not supported on %s\n", dev_info(&pf->pdev->dev, "%s: PTP not supported on %s\n",

29
drivers/net/ethernet/intel/i40e/i40e_txrx.c
View File

@ -686,8 +686,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, u64 qword0_raw,
u32 error; u32 error;
qw0 = (struct i40e_16b_rx_wb_qw0 *)&qword0_raw; qw0 = (struct i40e_16b_rx_wb_qw0 *)&qword0_raw;
error = (qword1 & I40E_RX_PROG_STATUS_DESC_QW1_ERROR_MASK) >> error = FIELD_GET(I40E_RX_PROG_STATUS_DESC_QW1_ERROR_MASK, qword1);
I40E_RX_PROG_STATUS_DESC_QW1_ERROR_SHIFT;
if (error == BIT(I40E_RX_PROG_STATUS_DESC_FD_TBL_FULL_SHIFT)) { if (error == BIT(I40E_RX_PROG_STATUS_DESC_FD_TBL_FULL_SHIFT)) {
pf->fd_inv = le32_to_cpu(qw0->hi_dword.fd_id); pf->fd_inv = le32_to_cpu(qw0->hi_dword.fd_id);
@ -1398,8 +1397,7 @@ void i40e_clean_programming_status(struct i40e_ring *rx_ring, u64 qword0_raw,
{ {
u8 id; u8 id;
id = (qword1 & I40E_RX_PROG_STATUS_DESC_QW1_PROGID_MASK) >> id = FIELD_GET(I40E_RX_PROG_STATUS_DESC_QW1_PROGID_MASK, qword1);
I40E_RX_PROG_STATUS_DESC_QW1_PROGID_SHIFT;
if (id == I40E_RX_PROG_STATUS_DESC_FD_FILTER_STATUS) if (id == I40E_RX_PROG_STATUS_DESC_FD_FILTER_STATUS)
i40e_fd_handle_status(rx_ring, qword0_raw, qword1, id); i40e_fd_handle_status(rx_ring, qword0_raw, qword1, id);
@ -1759,11 +1757,9 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
u64 qword; u64 qword;
qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len); qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >> I40E_RXD_QW1_PTYPE_SHIFT; ptype = FIELD_GET(I40E_RXD_QW1_PTYPE_MASK, qword);
rx_error = (qword & I40E_RXD_QW1_ERROR_MASK) >> rx_error = FIELD_GET(I40E_RXD_QW1_ERROR_MASK, qword);
I40E_RXD_QW1_ERROR_SHIFT; rx_status = FIELD_GET(I40E_RXD_QW1_STATUS_MASK, qword);
rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
I40E_RXD_QW1_STATUS_SHIFT;
decoded = decode_rx_desc_ptype(ptype); decoded = decode_rx_desc_ptype(ptype);
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
@ -1896,13 +1892,10 @@ void i40e_process_skb_fields(struct i40e_ring *rx_ring,
union i40e_rx_desc *rx_desc, struct sk_buff *skb) union i40e_rx_desc *rx_desc, struct sk_buff *skb)
{ {
u64 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len); u64 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
u32 rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >> u32 rx_status = FIELD_GET(I40E_RXD_QW1_STATUS_MASK, qword);
I40E_RXD_QW1_STATUS_SHIFT;
u32 tsynvalid = rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK; u32 tsynvalid = rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK;
u32 tsyn = (rx_status & I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >> u32 tsyn = FIELD_GET(I40E_RXD_QW1_STATUS_TSYNINDX_MASK, rx_status);
I40E_RXD_QW1_STATUS_TSYNINDX_SHIFT; u8 rx_ptype = FIELD_GET(I40E_RXD_QW1_PTYPE_MASK, qword);
u8 rx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>
I40E_RXD_QW1_PTYPE_SHIFT;
if (unlikely(tsynvalid)) if (unlikely(tsynvalid))
i40e_ptp_rx_hwtstamp(rx_ring->vsi->back, skb, tsyn); i40e_ptp_rx_hwtstamp(rx_ring->vsi->back, skb, tsyn);
@ -2549,8 +2542,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget,
continue; continue;
} }
size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >> size = FIELD_GET(I40E_RXD_QW1_LENGTH_PBUF_MASK, qword);
I40E_RXD_QW1_LENGTH_PBUF_SHIFT;
if (!size) if (!size)
break; break;
@ -3594,8 +3586,7 @@ static inline int i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,
if (tx_flags & I40E_TX_FLAGS_HW_VLAN) { if (tx_flags & I40E_TX_FLAGS_HW_VLAN) {
td_cmd |= I40E_TX_DESC_CMD_IL2TAG1; td_cmd |= I40E_TX_DESC_CMD_IL2TAG1;
td_tag = (tx_flags & I40E_TX_FLAGS_VLAN_MASK) >> td_tag = FIELD_GET(I40E_TX_FLAGS_VLAN_MASK, tx_flags);
I40E_TX_FLAGS_VLAN_SHIFT;
} }
first->tx_flags = tx_flags; first->tx_flags = tx_flags;

21
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File

@ -474,10 +474,10 @@ static void i40e_release_rdma_qvlist(struct i40e_vf *vf)
*/ */
reg_idx = (msix_vf - 1) * vf->vf_id + qv_info->ceq_idx; reg_idx = (msix_vf - 1) * vf->vf_id + qv_info->ceq_idx;
reg = rd32(hw, I40E_VPINT_CEQCTL(reg_idx)); reg = rd32(hw, I40E_VPINT_CEQCTL(reg_idx));
next_q_index = (reg & I40E_VPINT_CEQCTL_NEXTQ_INDX_MASK) next_q_index = FIELD_GET(I40E_VPINT_CEQCTL_NEXTQ_INDX_MASK,
>> I40E_VPINT_CEQCTL_NEXTQ_INDX_SHIFT; reg);
next_q_type = (reg & I40E_VPINT_CEQCTL_NEXTQ_TYPE_MASK) next_q_type = FIELD_GET(I40E_VPINT_CEQCTL_NEXTQ_TYPE_MASK,
>> I40E_VPINT_CEQCTL_NEXTQ_TYPE_SHIFT; reg);
reg_idx = ((msix_vf - 1) * vf->vf_id) + (v_idx - 1); reg_idx = ((msix_vf - 1) * vf->vf_id) + (v_idx - 1);
reg = (next_q_index & reg = (next_q_index &
@ -555,10 +555,10 @@ i40e_config_rdma_qvlist(struct i40e_vf *vf,
* queue on top. Also link it with the new queue in CEQCTL. * queue on top. Also link it with the new queue in CEQCTL.
*/ */
reg = rd32(hw, I40E_VPINT_LNKLSTN(reg_idx)); reg = rd32(hw, I40E_VPINT_LNKLSTN(reg_idx));
next_q_idx = ((reg & I40E_VPINT_LNKLSTN_FIRSTQ_INDX_MASK) >> next_q_idx = FIELD_GET(I40E_VPINT_LNKLSTN_FIRSTQ_INDX_MASK,
I40E_VPINT_LNKLSTN_FIRSTQ_INDX_SHIFT); reg);
next_q_type = ((reg & I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_MASK) >> next_q_type = FIELD_GET(I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_MASK,
I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_SHIFT); reg);
if (qv_info->ceq_idx != I40E_QUEUE_INVALID_IDX) { if (qv_info->ceq_idx != I40E_QUEUE_INVALID_IDX) {
reg_idx = (msix_vf - 1) * vf->vf_id + qv_info->ceq_idx; reg_idx = (msix_vf - 1) * vf->vf_id + qv_info->ceq_idx;
@ -4673,9 +4673,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
ivi->max_tx_rate = vf->tx_rate; ivi->max_tx_rate = vf->tx_rate;
ivi->min_tx_rate = 0; ivi->min_tx_rate = 0;
ivi->vlan = le16_to_cpu(vsi->info.pvid) & I40E_VLAN_MASK; ivi->vlan = le16_get_bits(vsi->info.pvid, I40E_VLAN_MASK);
ivi->qos = (le16_to_cpu(vsi->info.pvid) & I40E_PRIORITY_MASK) >> ivi->qos = le16_get_bits(vsi->info.pvid, I40E_PRIORITY_MASK);
I40E_VLAN_PRIORITY_SHIFT;
if (vf->link_forced == false) if (vf->link_forced == false)
ivi->linkstate = IFLA_VF_LINK_STATE_AUTO; ivi->linkstate = IFLA_VF_LINK_STATE_AUTO;
else if (vf->link_up == true) else if (vf->link_up == true)

3
drivers/net/ethernet/intel/i40e/i40e_xsk.c
View File

@ -476,8 +476,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
continue; continue;
} }
size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >> size = FIELD_GET(I40E_RXD_QW1_LENGTH_PBUF_MASK, qword);
I40E_RXD_QW1_LENGTH_PBUF_SHIFT;
if (!size) if (!size)
break; break;