Message ID | 20231211211928.2261079-1-david.m.ertman@intel.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [iwl-net,v2] ice: alter feature support check for SRIOV and LAG | expand |
On Mon, Dec 11, 2023 at 01:19:28PM -0800, Dave Ertman wrote: > Previously, the ice driver had support for using a hanldler for bonding > netdev events to ensure that conflicting features were not allowed to be > activated at the same time. While this was still in place, additional > support was added to specifically support SRIOV and LAG together. These > both utilized the netdev event handler, but the SRIOV and LAG feature was > behind a capabilities feature check to make sure the current NVM has > support. > > The exclusion part of the event handler should be removed since there are > users who have custom made solutions that depend on the non-exclusion of > features. > > Wrap the creation/registration and cleanup of the event handler and > associated structs in the probe flow with a feature check so that the > only systems that support the full implementation of LAG features will > initialize support. This will leave other systems unhindered with > functionality as it existed before any LAG code was added. > > Fixes: bb52f42acef6 ("ice: Add driver support for firmware changes for LAG") > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Signed-off-by: Dave Ertman <david.m.ertman@intel.com> Hi Dave, I'm interpreting this as fixing a regression of an existing feature. In that context: Reviewed-by: Simon Horman <horms@kernel.org>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Dave Ertman > Sent: Tuesday, December 12, 2023 2:49 AM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Brandeburg, Jesse <jesse.brandeburg@intel.com> > Subject: [Intel-wired-lan] [PATCH iwl-net v2] ice: alter feature support check for SRIOV and LAG > > Previously, the ice driver had support for using a hanldler for bonding > netdev events to ensure that conflicting features were not allowed to be > activated at the same time. While this was still in place, additional > support was added to specifically support SRIOV and LAG together. These > both utilized the netdev event handler, but the SRIOV and LAG feature was > behind a capabilities feature check to make sure the current NVM has > support. > > The exclusion part of the event handler should be removed since there are > users who have custom made solutions that depend on the non-exclusion of > features. > > Wrap the creation/registration and cleanup of the event handler and > associated structs in the probe flow with a feature check so that the > only systems that support the full implementation of LAG features will > initialize support. This will leave other systems unhindered with > functionality as it existed before any LAG code was added. > > Fixes: bb52f42acef6 ("ice: Add driver support for firmware changes for LAG") > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Signed-off-by: Dave Ertman <david.m.ertman@intel.com> > > --- > > v2: Added Fixes tag > --- > drivers/net/ethernet/intel/ice/ice_lag.c | 2 ++ > 1 file changed, 2 insertions(+) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c index 280994ee5933..b47cd43ae871 100644 --- a/drivers/net/ethernet/intel/ice/ice_lag.c +++ b/drivers/net/ethernet/intel/ice/ice_lag.c @@ -1981,6 +1981,8 @@ int ice_init_lag(struct ice_pf *pf) int n, err; ice_lag_init_feature_support_flag(pf); + if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG)) + return 0; pf->lag = kzalloc(sizeof(*lag), GFP_KERNEL); if (!pf->lag)