Commit 7173be21 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

ice: fix pre-shifted bit usage 



While converting to FIELD_PREP() and FIELD_GET(), it was noticed that
some of the RSS defines had *included* the shift in their definitions.
This is completely outside of normal, such that a developer could easily
make a mistake and shift at the usage site (like when using
FIELD_PREP()).

Rename the defines and set them to the "pre-shifted values" so they
match the template the driver normally uses for masks and the member
bits of the mask, which also allows the driver to use FIELD_PREP
correctly with these values. Use GENMASK() for this changed MASK value.

Do the same for the VLAN EMODE defines as well.

Reviewed-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 23eca34e

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+5 −5
Original line number Diff line number Diff line
@@ -422,10 +422,10 @@ struct ice_aqc_vsi_props { 
#define ICE_AQ_VSI_INNER_VLAN_INSERT_PVID	BIT(2)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_S		3

#define ICE_AQ_VSI_INNER_VLAN_EMODE_M		(0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH	(0x0 << ICE_AQ_VSI_INNER_VLAN_EMODE_S)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_UP	(0x1 << ICE_AQ_VSI_INNER_VLAN_EMODE_S)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR		(0x2 << ICE_AQ_VSI_INNER_VLAN_EMODE_S)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING	(0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S)

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH	0x0U

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_UP	0x1U

#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR		0x2U

#define ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING	0x3U

	u8 inner_vlan_reserved2[3];

	/* ingress egress up sections */

	__le32 ingress_table; /* bitmap, 3 bits per up */
@@ -491,7 +491,7 @@ struct ice_aqc_vsi_props { 
#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S		2

#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_M		(0xF << ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S)

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_S		6

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M		(0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S)

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M		GENMASK(7, 6)

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ		0x0U

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ	0x1U

#define ICE_AQ_VSI_Q_OPT_RSS_HASH_XOR		0x2U

drivers/net/ethernet/intel/ice/ice_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -984,7 +984,8 @@ static void ice_set_dflt_vsi_ctx(struct ice_hw *hw, struct ice_vsi_ctx *ctxt) 
	 */

	if (ice_is_dvm_ena(hw)) {

		ctxt->info.inner_vlan_flags |=

			ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING;

			FIELD_PREP(ICE_AQ_VSI_INNER_VLAN_EMODE_M,

				   ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING);

		ctxt->info.outer_vlan_flags =

			FIELD_PREP(ICE_AQ_VSI_OUTER_VLAN_TX_MODE_M,

				   ICE_AQ_VSI_OUTER_VLAN_TX_MODE_ALL);

drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c

+11 −5
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena) 
{

	struct ice_hw *hw = &vsi->back->hw;

	struct ice_vsi_ctx *ctxt;

	u8 *ivf;

	int err;



	/* do not allow modifying VLAN stripping when a port VLAN is configured
@@ -143,19 +144,24 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena) 
	if (!ctxt)

		return -ENOMEM;



	ivf = &ctxt->info.inner_vlan_flags;



	/* Here we are configuring what the VSI should do with the VLAN tag in

	 * the Rx packet. We can either leave the tag in the packet or put it in

	 * the Rx descriptor.

	 */

	if (ena)

	if (ena) {

		/* Strip VLAN tag from Rx packet and put it in the desc */

		ctxt->info.inner_vlan_flags = ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH;

	else

		*ivf = FIELD_PREP(ICE_AQ_VSI_INNER_VLAN_EMODE_M,

				  ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH);

	} else {

		/* Disable stripping. Leave tag in packet */

		ctxt->info.inner_vlan_flags = ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING;

		*ivf = FIELD_PREP(ICE_AQ_VSI_INNER_VLAN_EMODE_M,

				  ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING);

	}



	/* Allow all packets untagged/tagged */

	ctxt->info.inner_vlan_flags |= ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL;

	*ivf |= ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL;



	ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);