| Message ID | 20240920115508.3168-3-marcin.szycik@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [iwl-net,1/2] ice: Fix entering Safe Mode | expand |
On Fri, Sep 20, 2024 at 01:55:09PM +0200, Marcin Szycik wrote: > If DDP package is missing or corrupted, the driver should enter Safe Mode. > Instead, an error is returned and probe fails. > > Don't check return value of ice_init_ddp_config() to fix this. no one else checks the retval after your fix so adjust it to return void. > > Repro: > * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg) > * Load ice > > Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology") > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com> > --- > drivers/net/ethernet/intel/ice/ice_main.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c > index 0f5c9d347806..7b6725d652e1 100644 > --- a/drivers/net/ethernet/intel/ice/ice_main.c > +++ b/drivers/net/ethernet/intel/ice/ice_main.c > @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf) > > ice_init_feature_support(pf); > > - err = ice_init_ddp_config(hw, pf); > - if (err) > - return err; > + ice_init_ddp_config(hw, pf); > > /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be > * set in pf->state, which will cause ice_is_safe_mode to return > -- > 2.45.0 > >
On 20.09.2024 14:03, Maciej Fijalkowski wrote: > On Fri, Sep 20, 2024 at 01:55:09PM +0200, Marcin Szycik wrote: >> If DDP package is missing or corrupted, the driver should enter Safe Mode. >> Instead, an error is returned and probe fails. >> >> Don't check return value of ice_init_ddp_config() to fix this. > > no one else checks the retval after your fix so adjust it to return void. Thanks, will fix in v2. >> >> Repro: >> * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg) >> * Load ice >> >> Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology") >> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> >> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com> >> --- >> drivers/net/ethernet/intel/ice/ice_main.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c >> index 0f5c9d347806..7b6725d652e1 100644 >> --- a/drivers/net/ethernet/intel/ice/ice_main.c >> +++ b/drivers/net/ethernet/intel/ice/ice_main.c >> @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf) >> >> ice_init_feature_support(pf); >> >> - err = ice_init_ddp_config(hw, pf); >> - if (err) >> - return err; >> + ice_init_ddp_config(hw, pf); >> >> /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be >> * set in pf->state, which will cause ice_is_safe_mode to return >> -- >> 2.45.0 >> >>
On 9/20/2024 5:03 AM, Maciej Fijalkowski wrote: > Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. > > > On Fri, Sep 20, 2024 at 01:55:09PM +0200, Marcin Szycik wrote: >> If DDP package is missing or corrupted, the driver should enter Safe Mode. >> Instead, an error is returned and probe fails. >> >> Don't check return value of ice_init_ddp_config() to fix this. > > no one else checks the retval after your fix so adjust it to return void. > >> >> Repro: >> * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg) >> * Load ice >> >> Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology") >> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> >> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com> >> --- >> drivers/net/ethernet/intel/ice/ice_main.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c >> index 0f5c9d347806..7b6725d652e1 100644 >> --- a/drivers/net/ethernet/intel/ice/ice_main.c >> +++ b/drivers/net/ethernet/intel/ice/ice_main.c >> @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf) >> >> ice_init_feature_support(pf); >> >> - err = ice_init_ddp_config(hw, pf); >> - if (err) >> - return err; >> + ice_init_ddp_config(hw, pf); As an alternative solution you could potentially do the following, which would make the flow more readable: err = ice_init_ddp_config(hw, pf); if (err || ice_is_safe_mode(pf)) ice_set_safe_mode_caps(hw); Also, should there be some sort of messaging if the device goes into safe mode? I wonder if a dev_dbg() would be better than nothing. >> >> /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be >> * set in pf->state, which will cause ice_is_safe_mode to return >> -- >> 2.45.0 >> >> >
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 0f5c9d347806..7b6725d652e1 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf) ice_init_feature_support(pf); - err = ice_init_ddp_config(hw, pf); - if (err) - return err; + ice_init_ddp_config(hw, pf); /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be * set in pf->state, which will cause ice_is_safe_mode to return
If DDP package is missing or corrupted, the driver should enter Safe Mode. Instead, an error is returned and probe fails. Don't check return value of ice_init_ddp_config() to fix this. Repro: * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg) * Load ice Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology") Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com> --- drivers/net/ethernet/intel/ice/ice_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)