Skip to content

Commit b972060

Browse files
Marcin Szycikanguy11
authored andcommitted
ice: Fix entering Safe Mode
If DDP package is missing or corrupted, the driver should enter Safe Mode. Instead, an error is returned and probe fails. To fix this, don't exit init if ice_init_ddp_config() returns an error. Repro: * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg) * Load ice Fixes: cc5776f ("ice: Enable switching default Tx scheduler topology") Reviewed-by: Przemek Kitszel <[email protected]> Signed-off-by: Marcin Szycik <[email protected]> Reviewed-by: Brett Creeley <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 1fd9e4f commit b972060

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4767,14 +4767,12 @@ int ice_init_dev(struct ice_pf *pf)
47674767
ice_init_feature_support(pf);
47684768

47694769
err = ice_init_ddp_config(hw, pf);
4770-
if (err)
4771-
return err;
47724770

47734771
/* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be
47744772
* set in pf->state, which will cause ice_is_safe_mode to return
47754773
* true
47764774
*/
4777-
if (ice_is_safe_mode(pf)) {
4775+
if (err || ice_is_safe_mode(pf)) {
47784776
/* we already got function/device capabilities but these don't
47794777
* reflect what the driver needs to do in safe mode. Instead of
47804778
* adding conditional logic everywhere to ignore these

0 commit comments

Comments
 (0)