[Intel-wired-lan] [PATCH iwl-net V4, 2/2] i40e: Fully suspend and resume IO operations in EEH case

[Thinh Tran]

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.kel...@intel.com>
Tested-by: Robert Thomas <rob.tho...@ibm.com>
Signed-off-by: Thinh Tran <thin...@linux.ibm.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c 
b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 281c8ec27af2..9f71a61e0c52 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11138,6 +11138,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__);
 }
 
 /**
@@ -16459,7 +16461,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;
@@ -16481,7 +16483,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;
@@ -16544,7 +16547,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);
 }
 
 /**
-- 
2.25.1