| Message ID | 20231003053110.3872424-1-jesse.brandeburg@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-net,v1] ice: fix over-shifted variable | expand |
On Mon, Oct 02, 2023 at 10:31:10PM -0700, Jesse Brandeburg wrote: > Since the introduction of the ice driver the code has been > double-shifting the RSS enabling field, because the define already has > shifts in it and can't have the regular pattern of "a << shiftval & > mask" applied. > > Most places in the code got it right, but one line was still wrong. Fix > this one location for easy backports to stable. An in-progress patch > fixes the defines to "standard" and will be applied as part of the > regular -next process sometime after this one. > > Fixes: d76a60ba7afb ("ice: Add support for VLANs and offloads") > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > CC: stable@vger.kernel.org > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Reviewed-by: Simon Horman <horms@kernel.org>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Jesse Brandeburg > Sent: Tuesday, October 3, 2023 11:01 AM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Brandeburg, Jesse <jesse.brandeburg@intel.com>; stable@vger.kernel.org; Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> > Subject: [Intel-wired-lan] [PATCH iwl-net v1] ice: fix over-shifted variable > > Since the introduction of the ice driver the code has been > double-shifting the RSS enabling field, because the define already has > shifts in it and can't have the regular pattern of "a << shiftval & > mask" applied. > > Most places in the code got it right, but one line was still wrong. Fix > this one location for easy backports to stable. An in-progress patch > fixes the defines to "standard" and will be applied as part of the > regular -next process sometime after this one. > > Fixes: d76a60ba7afb ("ice: Add support for VLANs and offloads") > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > CC: stable@vger.kernel.org > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_lib.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 201570cd2e0b..0aac519cc298 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -1201,8 +1201,7 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi) ctxt->info.q_opt_rss = ((lut_type << ICE_AQ_VSI_Q_OPT_RSS_LUT_S) & ICE_AQ_VSI_Q_OPT_RSS_LUT_M) | - ((hash_type << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) & - ICE_AQ_VSI_Q_OPT_RSS_HASH_M); + (hash_type & ICE_AQ_VSI_Q_OPT_RSS_HASH_M); } static void
Since the introduction of the ice driver the code has been double-shifting the RSS enabling field, because the define already has shifts in it and can't have the regular pattern of "a << shiftval & mask" applied. Most places in the code got it right, but one line was still wrong. Fix this one location for easy backports to stable. An in-progress patch fixes the defines to "standard" and will be applied as part of the regular -next process sometime after this one. Fixes: d76a60ba7afb ("ice: Add support for VLANs and offloads") Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> CC: stable@vger.kernel.org Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> --- drivers/net/ethernet/intel/ice/ice_lib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) base-commit: 6a70e5cbedaf8ad10528ac9ac114f3ec20f422df