On Tue, Jun 02, 2015 at 07:12:53AM +0100, Jiang Liu wrote: > From: Hanjun Guo <[email protected]> > > ARM64 ACPI based PCI host bridge init needs a arch dependent > struct pci_controller to accommodate common PCI host bridge > code which is introduced later, or it will lead to compile > errors on ARM64. > > Signed-off-by: Hanjun Guo <[email protected]> > Tested-by: Suravee Suthikulpanit <[email protected]> > CC: Arnd Bergmann <[email protected]> > CC: Catalin Marinas <[email protected]> > CC: Liviu Dudau <[email protected]> > CC: Lorenzo Pieralisi <[email protected]> > CC: Will Deacon <[email protected]> > Signed-off-by: Jiang Liu <[email protected]> > --- > arch/arm64/include/asm/pci.h | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h > index b008a72f8bc0..70884957f253 100644 > --- a/arch/arm64/include/asm/pci.h > +++ b/arch/arm64/include/asm/pci.h > @@ -10,6 +10,16 @@ > #include <asm-generic/pci-bridge.h> > #include <asm-generic/pci-dma-compat.h> > > +struct acpi_device; > + > +struct pci_controller { > +#ifdef CONFIG_ACPI > + struct acpi_device *companion; /* ACPI companion device */ > +#endif > + int segment; /* PCI domain */ > + int node; /* NUMA node */ > +};
There is nothing ARM64 specific in this structure. The only reason I see you want to keep it arch specific is the iommu pointer on x86, but I think we should find a way to make the common bits shared across archs (ie the struct above) and add (maybe a void*) to the generic struct to cater for arch specific data. Thoughts ? Lorenzo > + > #define PCIBIOS_MIN_IO 0x1000 > #define PCIBIOS_MIN_MEM 0 > > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
