Subject: [Patch v4 5/8] ARM64/PCI/ACPI: Introduce struct pci_controller for ACPI

From: [email-masked] (Lorenzo Pieralisi)
Date: Tue, 2 Jun 2015 10:35:25 +0100

On Tue, Jun 02, 2015 at 07:12:53AM +0100, Jiang Liu wrote:
> From: Hanjun Guo <[email-masked]>
> 
> 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-masked]>
> Tested-by: Suravee Suthikulpanit <[email-masked]>
> CC: Arnd Bergmann <[email-masked]>
> CC: Catalin Marinas <[email-masked]>
> CC: Liviu Dudau <[email-masked]>
> CC: Lorenzo Pieralisi <[email-masked]>
> CC: Will Deacon <[email-masked]>
> Signed-off-by: Jiang Liu <[email-masked]>
> ---
>  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
>