Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94973b24 authored Dec 17, 2015 by Alistair Popple Committed by Michael Ellerman Dec 17, 2015

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 250c7b27 ("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>

parent e80c4e7c

arch/powerpc/include/asm/pci-bridge.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,6 +205,7 @@ struct pci_dn {

	int pci_ext_config_space; /* for pci devices */		int pci_ext_config_space; /* for pci devices */

			struct pci_dev pcidev; / back-pointer to the pci device */
	#ifdef CONFIG_EEH		#ifdef CONFIG_EEH
	struct eeh_dev edev; / eeh device */		struct eeh_dev edev; / eeh device */
	#endif		#endif

arch/powerpc/platforms/powernv/pci-ioda.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1008,6 +1008,7 @@ static void pnv_ioda_setup_same_PE(struct pci_bus bus, struct pnv_ioda_pe pe)
	pci_name(dev));		pci_name(dev));
	continue;		continue;
	}		}
			pdn->pcidev = dev;
	pdn->pe_number = pe->pe_number;		pdn->pe_number = pe->pe_number;
	pe->dma_weight += pnv_ioda_dma_weight(dev);		pe->dma_weight += pnv_ioda_dma_weight(dev);
	if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate)		if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate)