powerpc/eeh: Pass eeh_dev to eeh_ops->restore_config()

Mechanical conversion of the eeh_ops interfaces to use eeh_dev to reference
a specific device rather than pci_dn. No functional changes.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200725081231.39076-7-oohall@gmail.com

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 091d1ed2879886570629174c7c2b6d80bef8094e..c23c8fd5229db20ab0e57d1876d1d7af24470f18 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -229,7 +229,7 @@ struct eeh_ops {
        int (*read_config)(struct pci_dn *pdn, int where, int size, u32 *val);
        int (*write_config)(struct pci_dn *pdn, int where, int size, u32 val);
        int (*next_error)(struct eeh_pe **pe);
-       int (*restore_config)(struct pci_dn *pdn);
+       int (*restore_config)(struct eeh_dev *edev);
        int (*notify_resume)(struct pci_dn *pdn);
 };
 

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index a4df6f6de0bdd63a534a5282131fad259ae866ea..1cef0f4bb2d55f604cb21b921312cc5b5d00ab98 100644 (file)
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -726,7 +726,6 @@ static void eeh_disable_and_save_dev_state(struct eeh_dev *edev,
 
 static void eeh_restore_dev_state(struct eeh_dev *edev, void *userdata)
 {
-       struct pci_dn *pdn = eeh_dev_to_pdn(edev);
        struct pci_dev *pdev = eeh_dev_to_pci_dev(edev);
        struct pci_dev *dev = userdata;
 
@@ -734,8 +733,8 @@ static void eeh_restore_dev_state(struct eeh_dev *edev, void *userdata)
                return;
 
        /* Apply customization from firmware */
-       if (pdn && eeh_ops->restore_config)
-               eeh_ops->restore_config(pdn);
+       if (eeh_ops->restore_config)
+               eeh_ops->restore_config(edev);
 
        /* The caller should restore state for the specified device */
        if (pdev != dev)

diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index 177852e39a25348963505a9005378fee75a3d791..d71493f66917743d25d06da6539c81f7d63419fa 100644 (file)
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -843,16 +843,14 @@ static void eeh_restore_device_bars(struct eeh_dev *edev)
  */
 static void eeh_restore_one_device_bars(struct eeh_dev *edev, void *flag)
 {
-       struct pci_dn *pdn = eeh_dev_to_pdn(edev);
-
        /* Do special restore for bridges */
        if (edev->mode & EEH_DEV_BRIDGE)
                eeh_restore_bridge_bars(edev);
        else
                eeh_restore_device_bars(edev);
 
-       if (eeh_ops->restore_config && pdn)
-               eeh_ops->restore_config(pdn);
+       if (eeh_ops->restore_config)
+               eeh_ops->restore_config(edev);
 }
 
 /**

diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 8f3a7611efc100864ff710ee907dceae1052419d..a41e67f674e62b2340596ee804fb015e3946fbbc 100644 (file)
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -1619,12 +1619,10 @@ static int pnv_eeh_next_error(struct eeh_pe **pe)
        return ret;
 }
 
-static int pnv_eeh_restore_config(struct pci_dn *pdn)
+static int pnv_eeh_restore_config(struct eeh_dev *edev)
 {
-       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
        struct pnv_phb *phb;
        s64 ret = 0;
-       int config_addr = (pdn->busno << 8) | (pdn->devfn);
 
        if (!edev)
                return -EEXIST;
@@ -1638,7 +1636,7 @@ static int pnv_eeh_restore_config(struct pci_dn *pdn)
 
        if (ret) {
                pr_warn("%s: Can't reinit PCI dev 0x%x (%lld)\n",
-                       __func__, config_addr, ret);
+                       __func__, edev->bdfn, ret);
                return -EIO;
        }