ice: recap the VSI and QoS info after rebuild

Fix IRDMA hardware initialization timeout (-110) after resume by
separating VSI-dependent configuration from RDMA resource allocation,
ensuring VSI is rebuilt before IRDMA accesses it.

After resume from suspend, IRDMA hardware initialization fails:
  ice: IRDMA hardware initialization FAILED init_state=4 status=-110

Separate RDMA initialization into two phases:
1. ice_init_rdma() - Allocate resources only (no VSI/QoS access, no plug)
2. ice_rdma_finalize_setup() - Assign VSI/QoS info and plug device

This allows:
- ice_init_rdma() to stay in ice_resume() (mirrors ice_deinit_rdma()
  in ice_suspend())
- VSI assignment deferred until after ice_vsi_rebuild() completes
- QoS info updated after ice_dcb_rebuild() completes
- Device plugged only when control queues, VSI, and DCB are all ready

Fixes: bc69ad74867db ("ice: avoid IRQ collision to fix init failure on ACPI S3 resume")
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index def7efa154478876bf4f4d71dbbc243e68ed3064..2b2b22af42beeb54fb0ce627065b246d2154ba26 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -987,6 +987,7 @@ int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset);
 void ice_print_link_msg(struct ice_vsi *vsi, bool isup);
 int ice_plug_aux_dev(struct ice_pf *pf);
 void ice_unplug_aux_dev(struct ice_pf *pf);
+void ice_rdma_finalize_setup(struct ice_pf *pf);
 int ice_init_rdma(struct ice_pf *pf);
 void ice_deinit_rdma(struct ice_pf *pf);
 bool ice_is_wol_supported(struct ice_hw *hw);

diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c
index 420d45c2558b622e7f0fd0bb44be1440c3512ec7..ded029aa71d7d097351437fe11427f50d70a4d6b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_idc.c
+++ b/drivers/net/ethernet/intel/ice/ice_idc.c
@@ -360,6 +360,39 @@ void ice_unplug_aux_dev(struct ice_pf *pf)
        auxiliary_device_uninit(adev);
 }
 
+/**
+ * ice_rdma_finalize_setup - Complete RDMA setup after VSI is ready
+ * @pf: ptr to ice_pf
+ *
+ * Sets VSI-dependent information and plugs aux device.
+ * Must be called after ice_init_rdma(), ice_vsi_rebuild(), and
+ * ice_dcb_rebuild() complete.
+ */
+void ice_rdma_finalize_setup(struct ice_pf *pf)
+{
+       struct device *dev = ice_pf_to_dev(pf);
+       struct iidc_rdma_priv_dev_info *privd;
+       int ret;
+
+       if (!ice_is_rdma_ena(pf) || !pf->cdev_info)
+               return;
+
+       privd = pf->cdev_info->iidc_priv;
+       if (!privd || !pf->vsi || !pf->vsi[0] || !pf->vsi[0]->netdev)
+               return;
+
+       /* Assign VSI info now that VSI is valid */
+       privd->netdev = pf->vsi[0]->netdev;
+       privd->vport_id = pf->vsi[0]->vsi_num;
+
+       /* Update QoS info after DCB has been rebuilt */
+       ice_setup_dcb_qos_info(pf, &privd->qos_info);
+
+       ret = ice_plug_aux_dev(pf);
+       if (ret)
+               dev_warn(dev, "Failed to plug RDMA aux device: %d\n", ret);
+}
+
 /**
  * ice_init_rdma - initializes PF for RDMA use
  * @pf: ptr to ice_pf
@@ -398,22 +431,14 @@ int ice_init_rdma(struct ice_pf *pf)
        }
 
        cdev->iidc_priv = privd;
-       privd->netdev = pf->vsi[0]->netdev;
 
        privd->hw_addr = (u8 __iomem *)pf->hw.hw_addr;
        cdev->pdev = pf->pdev;
-       privd->vport_id = pf->vsi[0]->vsi_num;
 
        pf->cdev_info->rdma_protocol |= IIDC_RDMA_PROTOCOL_ROCEV2;
-       ice_setup_dcb_qos_info(pf, &privd->qos_info);
-       ret = ice_plug_aux_dev(pf);
-       if (ret)
-               goto err_plug_aux_dev;
+
        return 0;
 
-err_plug_aux_dev:
-       pf->cdev_info->adev = NULL;
-       xa_erase(&ice_aux_id, pf->aux_idx);
 err_alloc_xa:
        kfree(privd);
 err_privd_alloc:
@@ -432,7 +457,6 @@ void ice_deinit_rdma(struct ice_pf *pf)
        if (!ice_is_rdma_ena(pf))
                return;
 
-       ice_unplug_aux_dev(pf);
        xa_erase(&ice_aux_id, pf->aux_idx);
        kfree(pf->cdev_info->iidc_priv);
        kfree(pf->cdev_info);

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 4da37caa3ec9db99383bc73df24d4ae53da7280f..62914167d121d79449305f775f85d6dc4eb34f8c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5138,6 +5138,9 @@ int ice_load(struct ice_pf *pf)
        if (err)
                goto err_init_rdma;
 
+       /* Finalize RDMA: VSI already created, assign info and plug device */
+       ice_rdma_finalize_setup(pf);
+
        ice_service_task_restart(pf);
 
        clear_bit(ICE_DOWN, pf->state);
@@ -5169,6 +5172,7 @@ void ice_unload(struct ice_pf *pf)
 
        devl_assert_locked(priv_to_devlink(pf));
 
+       ice_unplug_aux_dev(pf);
        ice_deinit_rdma(pf);
        ice_deinit_features(pf);
        ice_tc_indir_block_unregister(vsi);
@@ -5595,6 +5599,7 @@ static int ice_suspend(struct device *dev)
         */
        disabled = ice_service_task_stop(pf);
 
+       ice_unplug_aux_dev(pf);
        ice_deinit_rdma(pf);
 
        /* Already suspended?, then there is nothing to do */
@@ -7859,7 +7864,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)
 
        ice_health_clear(pf);
 
-       ice_plug_aux_dev(pf);
+       ice_rdma_finalize_setup(pf);
        if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))
                ice_lag_rebuild(pf);