ice: Fix EMP reset handling
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Fri, 2 Aug 2019 08:25:25 +0000 (01:25 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 3 Sep 2019 20:47:12 +0000 (13:47 -0700)
ice_reset_subtask needs to handle EMP resets as well, as EMP resets
can be triggered by the firmware. This patch adds the logic to do
this.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_main.c

index f029aee..b62c01c 100644 (file)
@@ -567,6 +567,8 @@ static void ice_reset_subtask(struct ice_pf *pf)
                        reset_type = ICE_RESET_CORER;
                if (test_and_clear_bit(__ICE_GLOBR_RECV, pf->state))
                        reset_type = ICE_RESET_GLOBR;
+               if (test_and_clear_bit(__ICE_EMPR_RECV, pf->state))
+                       reset_type = ICE_RESET_EMPR;
                /* return if no valid reset type requested */
                if (reset_type == ICE_RESET_INVAL)
                        return;