> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-boun...@osuosl.org> On Behalf Of Karol > Kolacinski > Sent: Monday, January 8, 2024 6:17 PM > To: intel-wired-...@lists.osuosl.org > Cc: Keller, Jacob E <jacob.e.kel...@intel.com>; net...@vger.kernel.org; > Kolacinski, Karol <karol.kolacin...@intel.com>; Nguyen, Anthony L > <anthony.l.ngu...@intel.com>; Brandeburg, Jesse <jesse.brandeb...@intel.com> > Subject: [Intel-wired-lan] [PATCH v5 iwl-next 2/6] ice: pass reset type to > PTP reset functions > > From: Jacob Keller <jacob.e.kel...@intel.com> > > The ice_ptp_prepare_for_reset() and ice_ptp_reset() functions currently > check the pf->flags ICE_FLAG_PFR_REQ bit to determine if the current > reset is a PF reset or not. > > This is problematic, because it is possible that a PF reset and a higher > level reset (CORE reset, GLOBAL reset, EMP reset) are requested > simultaneously. In that case, the driver performs the highest level > reset requested. However, the ICE_FLAG_PFR_REQ flag will still be set. > > The main driver reset functions take an enum ice_reset_req indicating > which reset is actually being performed. Pass this data into the PTP > functions and rely on this instead of relying on the driver flags. > > This ensures that the PTP code performs the proper level of reset that > the driver is actually undergoing. > > Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com> > Signed-off-by: Karol Kolacinski <karol.kolacin...@intel.com> > Reviewed-by: Jacob Keller <jacob.e.kel...@intel.com> > --- > V4 -> V5: added missing ice_ptp_reset() definition > > drivers/net/ethernet/intel/ice/ice_main.c | 4 ++-- > drivers/net/ethernet/intel/ice/ice_ptp.c | 13 +++++++------ > drivers/net/ethernet/intel/ice/ice_ptp.h | 16 ++++++++++++---- > 3 files changed, 21 insertions(+), 12 deletions(-) >
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pu...@intel.com> (A Contingent worker at Intel)
