ice: Distinguish driver reset and removal for AQ shutdown

Admin queue command for shutdown AQ contains a flag to indicate driver
unload. However, the flag is always set in the driver, even for resets. It
can cause the firmware to consider driver as unloaded once the PF reset is
triggered on all ports of device, which could lead to unexpected results.

Add an additional function parameter to functions that shutdown AQ,
indicating whether the driver is actually unloading.

Reviewed-by: Ahmed Zaki <ahmed.zaki@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Piotr Gardocki <piotrx.gardocki@intel.com>
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h
index 86cc1df469dd9031f58e8d44f1a5f0f3060b2628..40dc735dc25cecc94e9bd58495fc37eb362c100d 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_common.h
+++ b/drivers/net/ethernet/intel/ice/ice_common.h
@@ -23,7 +23,7 @@ int ice_check_reset(struct ice_hw *hw);
 int ice_reset(struct ice_hw *hw, enum ice_reset_req req);
 int ice_create_all_ctrlq(struct ice_hw *hw);
 int ice_init_all_ctrlq(struct ice_hw *hw);
-void ice_shutdown_all_ctrlq(struct ice_hw *hw);
+void ice_shutdown_all_ctrlq(struct ice_hw *hw, bool unloading);
 void ice_destroy_all_ctrlq(struct ice_hw *hw);
 int
 ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq,

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c
index ca80b34f2f8a43509582acb8261139a61a8af261..ffaa6511c45562675a70a539759fb5b633a4a4eb 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.c
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c
@@ -687,10 +687,12 @@ struct ice_ctl_q_info *ice_get_sbq(struct ice_hw *hw)
  * ice_shutdown_ctrlq - shutdown routine for any control queue
  * @hw: pointer to the hardware structure
  * @q_type: specific Control queue type
+ * @unloading: is the driver unloading itself
  *
  * NOTE: this function does not destroy the control queue locks.
  */
-static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)
+static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type,
+                              bool unloading)
 {
        struct ice_ctl_q_info *cq;
 
@@ -698,7 +700,7 @@ static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)
        case ICE_CTL_Q_ADMIN:
                cq = &hw->adminq;
                if (ice_check_sq_alive(hw, cq))
-                       ice_aq_q_shutdown(hw, true);
+                       ice_aq_q_shutdown(hw, unloading);
                break;
        case ICE_CTL_Q_SB:
                cq = &hw->sbq;
@@ -717,20 +719,21 @@ static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)
 /**
  * ice_shutdown_all_ctrlq - shutdown routine for all control queues
  * @hw: pointer to the hardware structure
+ * @unloading: is the driver unloading itself
  *
  * NOTE: this function does not destroy the control queue locks. The driver
  * may call this at runtime to shutdown and later restart control queues, such
  * as in response to a reset event.
  */
-void ice_shutdown_all_ctrlq(struct ice_hw *hw)
+void ice_shutdown_all_ctrlq(struct ice_hw *hw, bool unloading)
 {
        /* Shutdown FW admin queue */
-       ice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN);
+       ice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN, unloading);
        /* Shutdown PHY Sideband */
        if (ice_is_sbq_supported(hw))
-               ice_shutdown_ctrlq(hw, ICE_CTL_Q_SB);
+               ice_shutdown_ctrlq(hw, ICE_CTL_Q_SB, unloading);
        /* Shutdown PF-VF Mailbox */
-       ice_shutdown_ctrlq(hw, ICE_CTL_Q_MAILBOX);
+       ice_shutdown_ctrlq(hw, ICE_CTL_Q_MAILBOX, unloading);
 }
 
 /**
@@ -762,7 +765,7 @@ int ice_init_all_ctrlq(struct ice_hw *hw)
                        break;
 
                ice_debug(hw, ICE_DBG_AQ_MSG, "Retry Admin Queue init due to FW critical error\n");
-               ice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN);
+               ice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN, true);
                msleep(ICE_CTL_Q_ADMIN_INIT_MSEC);
        } while (retry++ < ICE_CTL_Q_ADMIN_INIT_TIMEOUT);
 
@@ -843,7 +846,7 @@ static void ice_destroy_ctrlq_locks(struct ice_ctl_q_info *cq)
 void ice_destroy_all_ctrlq(struct ice_hw *hw)
 {
        /* shut down all the control queues first */
-       ice_shutdown_all_ctrlq(hw);
+       ice_shutdown_all_ctrlq(hw, true);
 
        ice_destroy_ctrlq_locks(&hw->adminq);
        if (ice_is_sbq_supported(hw))

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index f4a39016a675d7c01b8ddf06f986e480cbac05da..14ec4ebcd9afc41d2fad75c5a4aa8c272225b301 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -623,7 +623,7 @@ skip:
        if (hw->port_info)
                ice_sched_clear_port(hw->port_info);
 
-       ice_shutdown_all_ctrlq(hw);
+       ice_shutdown_all_ctrlq(hw, false);
 
        set_bit(ICE_PREPARED_FOR_RESET, pf->state);
 }
@@ -5499,7 +5499,7 @@ static void ice_prepare_for_shutdown(struct ice_pf *pf)
                if (pf->vsi[v])
                        pf->vsi[v]->vsi_num = 0;
 
-       ice_shutdown_all_ctrlq(hw);
+       ice_shutdown_all_ctrlq(hw, true);
 }
 
 /**
@@ -7759,7 +7759,7 @@ err_vsi_rebuild:
 err_sched_init_port:
        ice_sched_cleanup_all(hw);
 err_init_ctrlq:
-       ice_shutdown_all_ctrlq(hw);
+       ice_shutdown_all_ctrlq(hw, false);
        set_bit(ICE_RESET_FAILED, pf->state);
 clear_recovery:
        /* set this bit in PF state to control service task scheduling */