]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
i40e: Fully suspend and resume IO operations in EEH case
authorThinh Tran <thinhtr@linux.ibm.com>
Tue, 28 May 2024 22:06:06 +0000 (15:06 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 30 May 2024 01:56:30 +0000 (18:56 -0700)
When EEH events occurs, the callback functions in the i40e, which are
managed by the EEH driver, will completely suspend and resume all IO
operations.

- In the PCI error detected callback, replaced i40e_prep_for_reset()
  with i40e_io_suspend(). The change is to fully suspend all I/O
  operations
- In the PCI error slot reset callback, replaced pci_enable_device_mem()
  with pci_enable_device(). This change enables both I/O and memory of
  the device.
- In the PCI error resume callback, replaced i40e_handle_reset_warning()
  with i40e_io_resume(). This change allows the system to resume I/O
  operations

Fixes: a5f3d2c17b07 ("powerpc/pseries/pci: Add MSI domains")
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Robert Thomas <rob.thomas@ibm.com>
Signed-off-by: Thinh Tran <thinhtr@linux.ibm.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240528-net-2024-05-28-intel-net-fixes-v1-3-dc8593d2bbc6@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/i40e/i40e_main.c

index d5f25ea304bf73929a3df6bb275cab8569d8c374..284c3fad5a6e4f757097ecaf5e6a72816c09f67b 100644 (file)
@@ -11171,6 +11171,8 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit,
        ret = i40e_reset(pf);
        if (!ret)
                i40e_rebuild(pf, reinit, lock_acquired);
+       else
+               dev_err(&pf->pdev->dev, "%s: i40e_reset() FAILED", __func__);
 }
 
 /**
@@ -16491,7 +16493,7 @@ static pci_ers_result_t i40e_pci_error_detected(struct pci_dev *pdev,
 
        /* shutdown all operations */
        if (!test_bit(__I40E_SUSPENDED, pf->state))
-               i40e_prep_for_reset(pf);
+               i40e_io_suspend(pf);
 
        /* Request a slot reset */
        return PCI_ERS_RESULT_NEED_RESET;
@@ -16513,7 +16515,8 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev)
        u32 reg;
 
        dev_dbg(&pdev->dev, "%s\n", __func__);
-       if (pci_enable_device_mem(pdev)) {
+       /* enable I/O and memory of the device  */
+       if (pci_enable_device(pdev)) {
                dev_info(&pdev->dev,
                         "Cannot re-enable PCI device after reset.\n");
                result = PCI_ERS_RESULT_DISCONNECT;
@@ -16576,7 +16579,7 @@ static void i40e_pci_error_resume(struct pci_dev *pdev)
        if (test_bit(__I40E_SUSPENDED, pf->state))
                return;
 
-       i40e_handle_reset_warning(pf, false);
+       i40e_io_resume(pf);
 }
 
 /**