aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAlistair Popple <alistair@popple.id.au>2015-12-16 21:43:11 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-12-17 06:40:59 -0500
commit94973b24d61b03f99017f836d85e7d6739741bab (patch)
treef0f629be29d6ad1bc3a416e9458f7da227144ca8 /arch/powerpc
parente80c4e7ca5aed7d2fa766191bcf4e83fa411c720 (diff)
Revert "powerpc/pci: Remove unused struct pci_dn.pcidev field"
This commit removed the pcidev field from struct pci_dn as it was no longer in use by the kernel. However to support finding the association of Nvlink devices to GPU devices from the device-tree this field is required. This reverts commit 250c7b277c65 ("powerpc/pci: Remove unused struct pci_dn.pcidev field"). Signed-off-by: Alistair Popple <alistair@popple.id.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h1
-rw-r--r--arch/powerpc/platforms/powernv/pci-ioda.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 37fc53587bb4..54843ca5fa2b 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -205,6 +205,7 @@ struct pci_dn {
205 205
206 int pci_ext_config_space; /* for pci devices */ 206 int pci_ext_config_space; /* for pci devices */
207 207
208 struct pci_dev *pcidev; /* back-pointer to the pci device */
208#ifdef CONFIG_EEH 209#ifdef CONFIG_EEH
209 struct eeh_dev *edev; /* eeh device */ 210 struct eeh_dev *edev; /* eeh device */
210#endif 211#endif
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 272f6566d790..258ece5c0a8f 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1008,6 +1008,7 @@ static void pnv_ioda_setup_same_PE(struct pci_bus *bus, struct pnv_ioda_pe *pe)
1008 pci_name(dev)); 1008 pci_name(dev));
1009 continue; 1009 continue;
1010 } 1010 }
1011 pdn->pcidev = dev;
1011 pdn->pe_number = pe->pe_number; 1012 pdn->pe_number = pe->pe_number;
1012 pe->dma_weight += pnv_ioda_dma_weight(dev); 1013 pe->dma_weight += pnv_ioda_dma_weight(dev);
1013 if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate) 1014 if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate)