powerpc/powernv: Use pci_dn, not device_node, in PCI config accessor

The PCI config accessors previously relied on device_node.  Unfortunately,
VFs don't have a corresponding device_node, so change the accessors to use
pci_dn instead.

[bhelgaas: changelog]
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index ede6906..8eac8c5 100644 (file)
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -1038,21 +1038,31 @@ static inline bool pnv_eeh_cfg_blocked(struct device_node *dn)
 static int pnv_eeh_read_config(struct device_node *dn,
                               int where, int size, u32 *val)
 {
+       struct pci_dn *pdn = PCI_DN(dn);
+
+       if (!pdn)
+               return PCIBIOS_DEVICE_NOT_FOUND;
+
        if (pnv_eeh_cfg_blocked(dn)) {
                *val = 0xFFFFFFFF;
                return PCIBIOS_SET_FAILED;
        }
 
-       return pnv_pci_cfg_read(dn, where, size, val);
+       return pnv_pci_cfg_read(pdn, where, size, val);
 }
 
 static int pnv_eeh_write_config(struct device_node *dn,
                                int where, int size, u32 val)
 {
+       struct pci_dn *pdn = PCI_DN(dn);
+
+       if (!pdn)
+               return PCIBIOS_DEVICE_NOT_FOUND;
+
        if (pnv_eeh_cfg_blocked(dn))
                return PCIBIOS_SET_FAILED;
 
-       return pnv_pci_cfg_write(dn, where, size, val);
+       return pnv_pci_cfg_write(pdn, where, size, val);
 }
 
 static void pnv_eeh_dump_hub_diag_common(struct OpalIoP7IOCErrorData *data)

diff --cc arch/powerpc/platforms/powernv/pci.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci.h
Simple merge