Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754036AbaG2Qj5 (ORCPT ); Tue, 29 Jul 2014 12:39:57 -0400 Received: from service87.mimecast.com ([91.220.42.44]:41119 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753944AbaG2Qjy convert rfc822-to-8bit (ORCPT ); Tue, 29 Jul 2014 12:39:54 -0400 Message-ID: <53D7CE79.1080809@arm.com> Date: Tue, 29 Jul 2014 17:40:25 +0100 From: Sudeep Holla User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Hanjun Guo , Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland CC: Sudeep Holla , "graeme.gregory@linaro.org" , Arnd Bergmann , "grant.likely@linaro.org" , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles Garcia-Tobin , "linux-acpi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 References: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> <1406206825-15590-6-git-send-email-hanjun.guo@linaro.org> In-Reply-To: <1406206825-15590-6-git-send-email-hanjun.guo@linaro.org> X-OriginalArrivalTime: 29 Jul 2014 16:39:51.0284 (UTC) FILETIME=[B7DFFB40:01CFAB4B] X-MC-Unique: 114072917395207301 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/07/14 14:00, Hanjun Guo wrote: > As PCI for ARM64 is not ready, so introduce some stub functions > to make PCI optional for ACPI, and make ACPI core run without > CONFIG_PCI on ARM64. > > Since ACPI on X86 and IA64 depends on PCI and this patch only makes > PCI optinal for ARM64, it will not break anything on X86 and IA64. > > Signed-off-by: Hanjun Guo > --- > arch/arm64/include/asm/pci.h | 11 +++++++++++ > drivers/acpi/Makefile | 2 +- > drivers/acpi/internal.h | 5 +++++ > include/linux/pci.h | 37 +++++++++++++++++++++++++++---------- > 4 files changed, 44 insertions(+), 11 deletions(-) > create mode 100644 arch/arm64/include/asm/pci.h > > diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h > new file mode 100644 > index 0000000..250cd24 > --- /dev/null > +++ b/arch/arm64/include/asm/pci.h > @@ -0,0 +1,11 @@ > +#ifndef __ASM_PCI_H > +#define __ASM_PCI_H > +#ifdef __KERNEL__ > + > +/* > + * PCI address space differs from physical memory address space > + */ > +#define PCI_DMA_BUS_IS_PHYS (0) > + > +#endif /* __KERNEL__ */ > +#endif /* __ASM_PCI_H */ > diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile > index 505d4d7..8e9bbe6 100644 > --- a/drivers/acpi/Makefile > +++ b/drivers/acpi/Makefile > @@ -39,7 +39,7 @@ acpi-y += processor_core.o > acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o > acpi-y += ec.o > acpi-$(CONFIG_ACPI_DOCK) += dock.o > -acpi-y += pci_root.o pci_link.o pci_irq.o > +acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o > acpi-y += acpi_lpss.o > acpi-y += acpi_platform.o > acpi-y += acpi_pnp.o > diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h > index 4c5cf77..e1e6487 100644 > --- a/drivers/acpi/internal.h > +++ b/drivers/acpi/internal.h > @@ -26,8 +26,13 @@ > acpi_status acpi_os_initialize1(void); > int init_acpi_device_notify(void); > int acpi_scan_init(void); > +#ifdef CONFIG_PCI > void acpi_pci_root_init(void); > void acpi_pci_link_init(void); > +#else > +static inline void acpi_pci_root_init(void) {} > +static inline void acpi_pci_link_init(void) {} > +#endif > void acpi_processor_init(void); > void acpi_platform_init(void); > void acpi_pnp_init(void); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 466bcd1..27d7354 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h [...] > @@ -1394,6 +1395,23 @@ static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, > unsigned int devfn) > { return NULL; } > > +static inline struct pci_bus *pci_find_bus(int domain, int busnr) > +{ return NULL; } > + > +static inline int pci_bus_write_config_byte(struct pci_bus *bus, > + unsigned int devfn, int where, u8 val) > +{ return -ENODEV; } > + > +static inline int raw_pci_read(unsigned int domain, unsigned int bus, > + unsigned int devfn, int reg, int len, u32 *val) > +{ return -EINVAL; } > + > +static inline int raw_pci_write(unsigned int domain, unsigned int bus, > + unsigned int devfn, int reg, int len, u32 val) > +{ return -EINVAL; } IMO -ENOSYS is more suitable as these functions are not implemented for !CONFIG_PCI Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/