Skip to content

Commit 2a3e89a

Browse files
pkitszelanguy11
authored andcommitted
ice: register devlink prior to creating health reporters
ice_health_init() was introduced in the commit 2a82874 ("ice: add Tx hang devlink health reporter"). The call to it should have been put after ice_devlink_register(). It went unnoticed until next reporter by Konrad, which receives events from FW. FW is reporting all events, also from prior driver load, and thus it is not unlikely to have something at the very beginning. And that results in a splat: [ 24.455950] ? devlink_recover_notify.constprop.0+0x198/0x1b0 [ 24.455973] devlink_health_report+0x5d/0x2a0 [ 24.455976] ? __pfx_ice_health_status_lookup_compare+0x10/0x10 [ice] [ 24.456044] ice_process_health_status_event+0x1b7/0x200 [ice] Do the analogous thing for deinit patch. Fixes: 85d6164 ("ice: add fw and port health reporters") Reviewed-by: Aleksandr Loktionov <[email protected]> Reviewed-by: Michal Swiatkowski <[email protected]> Reviewed-by: Konrad Knitter <[email protected]> Signed-off-by: Przemek Kitszel <[email protected]> Tested-by: Sunitha Mekala <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent dce97cb commit 2a3e89a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5065,16 +5065,16 @@ static int ice_init_devlink(struct ice_pf *pf)
50655065
return err;
50665066

50675067
ice_devlink_init_regions(pf);
5068-
ice_health_init(pf);
50695068
ice_devlink_register(pf);
5069+
ice_health_init(pf);
50705070

50715071
return 0;
50725072
}
50735073

50745074
static void ice_deinit_devlink(struct ice_pf *pf)
50755075
{
5076-
ice_devlink_unregister(pf);
50775076
ice_health_deinit(pf);
5077+
ice_devlink_unregister(pf);
50785078
ice_devlink_destroy_regions(pf);
50795079
ice_devlink_unregister_params(pf);
50805080
}

0 commit comments

Comments
 (0)