powerpc/eeh: Add bdfn field to eeh_dev (7c33a994) · Commits · 戴 / test

Preparation for removing pci_dn from the powernv EEH code. The only thing we really use pci_dn for is to get the bdfn of the device for config space accesses, so adding that information to eeh_dev reduces the need to carry around the pci_dn. Signed-off-by:

Oliver O'Halloran <oohall@gmail.com> [SB: Re-wrapped commit message, fixed whitespace damage.] Signed-off-by:

Sam Bobroff <sbobroff@linux.ibm.com> Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/e458eb69a1f591d8a120782f23a8506b15d3c654.1565930772.git.sbobroff@linux.ibm.com

arch/powerpc/include/asm/eeh.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe)
		struct eeh_dev {
		int mode; /* EEH mode */
		int class_code; /* Class code of the device */
		int bdfn; /* bdfn of device (for cfg ops) */
		struct pci_controller *controller;
		int pe_config_addr; /* PE config address */
		u32 config_space[16]; /* Saved PCI config space */
		int pcix_cap; /* Saved PCIx capability */

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,8 @@ static inline const char eeh_driver_name(struct pci_dev pdev)

		#endif /* CONFIG_EEH */

		#define PCI_BUSNO(bdfn) ((bdfn >> 8) & 0xff)

		#else /* CONFIG_PCI */
		static inline void init_pci_config_tokens(void) { }
		#endif /* !CONFIG_PCI */

arch/powerpc/kernel/eeh_dev.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ struct eeh_dev eeh_dev_init(struct pci_dn pdn)
		/* Associate EEH device with OF node */
		pdn->edev = edev;
		edev->pdn = pdn;
		edev->bdfn = (pdn->busno << 8) \| pdn->devfn;
		edev->controller = pdn->phb;

		return edev;
		}

Admin message