From: sudeep.holla@arm.com (Sudeep Holla)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64
Date: Tue, 29 Jul 2014 17:40:25 +0100 [thread overview]
Message-ID: <53D7CE79.1080809@arm.com> (raw)
In-Reply-To: <1406206825-15590-6-git-send-email-hanjun.guo@linaro.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 <hanjun.guo@linaro.org>
> ---
> 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
next prev parent reply other threads:[~2014-07-29 16:40 UTC|newest]
Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 13:00 [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-07-24 13:00 ` [PATCH 01/19] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-07-28 18:29 ` Sudeep Holla
2014-07-28 22:49 ` Graeme Gregory
2014-07-29 8:49 ` Sudeep Holla
2014-07-29 13:08 ` Hanjun Guo
2014-07-29 13:50 ` Sudeep Holla
2014-07-29 14:07 ` Hanjun Guo
2014-07-28 18:30 ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 02/19] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-07-28 18:35 ` Sudeep Holla
2014-07-29 13:10 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 03/19] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo
2014-07-24 15:34 ` Mark Rutland
2014-07-25 10:42 ` Hanjun Guo
2014-07-28 18:28 ` Sudeep Holla
2014-07-29 13:00 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 04/19] ARM64 / ACPI: Introduce arch_fix_phys_package_id() for cpu topology Hanjun Guo
2014-07-24 14:43 ` Mark Brown
2014-07-25 10:32 ` Hanjun Guo
2014-07-28 18:51 ` Sudeep Holla
2014-08-01 6:35 ` Hanjun Guo
2014-08-01 10:48 ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-07-24 21:57 ` Naresh Bhat
2014-07-29 16:40 ` Sudeep Holla [this message]
2014-07-24 13:00 ` [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-07-29 16:40 ` Sudeep Holla
2014-07-31 3:53 ` Hanjun Guo
2014-07-31 4:22 ` Olof Johansson
2014-07-31 10:23 ` Hanjun Guo
2014-08-20 15:02 ` Grant Likely
2014-08-20 15:00 ` Grant Likely
2014-08-20 15:29 ` Catalin Marinas
2014-08-20 15:43 ` graeme.gregory at linaro.org
2014-07-24 13:00 ` [PATCH 07/19] ARM64 / ACPI: Parse MADT to map logical cpu to MPIDR and get cpu_possible/present_map Hanjun Guo
2014-07-24 23:06 ` Naresh Bhat
2014-07-25 11:11 ` Hanjun Guo
2014-07-30 18:20 ` Sudeep Holla
2014-07-31 8:14 ` Hanjun Guo
2014-08-20 15:14 ` Grant Likely
2014-07-24 13:00 ` [PATCH 08/19] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-07-30 18:21 ` Sudeep Holla
2014-07-31 8:15 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 09/19] ARM64 / ACPI: Move the initialization of cpu_logical_map(0) before acpi_boot_init() Hanjun Guo
2014-07-24 15:21 ` Mark Rutland
2014-07-25 10:39 ` Hanjun Guo
2014-07-25 12:18 ` Mark Rutland
2014-07-24 13:00 ` [PATCH 10/19] ARM64 / ACPI: Get the enable method for SMP initialization in ACPI way Hanjun Guo
2014-07-24 15:47 ` Mark Rutland
2014-07-25 10:51 ` Hanjun Guo
2014-07-25 12:24 ` Mark Rutland
2014-07-29 8:12 ` Hanjun Guo
2014-07-31 6:54 ` Olof Johansson
2014-07-31 10:57 ` Hanjun Guo
2014-08-04 9:56 ` Hanjun Guo
2014-07-31 18:52 ` Geoff Levand
2014-08-01 6:49 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 11/19] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-07-24 13:00 ` [PATCH 12/19] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2014-07-24 13:00 ` [PATCH 13/19] ACPI / table: Add new function to get table entries Hanjun Guo
2014-07-24 13:00 ` [PATCH 14/19] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-07-24 13:00 ` [PATCH 15/19] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-07-24 13:00 ` [PATCH 16/19] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-07-24 13:00 ` [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-07-24 13:00 ` [PATCH 18/19] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-07-24 13:00 ` [PATCH 19/19] Documentation: ACPI for ARM64 Hanjun Guo
2014-07-24 20:42 ` Randy Dunlap
2014-07-25 10:55 ` Hanjun Guo
[not found] ` <CAFoFrHaWWxRPRYM5+bWj0tGnz05SokqwVGejUCUi+U-KChFBdQ@mail.gmail.com>
2014-07-24 21:19 ` Randy Dunlap
2014-07-29 10:07 ` Christoffer Dall
2014-07-27 2:34 ` Olof Johansson
2014-07-28 8:42 ` Graeme Gregory
2014-07-28 16:23 ` Olof Johansson
2014-07-28 17:44 ` Mark Brown
2014-07-28 9:07 ` Arnd Bergmann
2014-07-28 9:23 ` Graeme Gregory
2014-07-28 10:46 ` Arnd Bergmann
2014-07-28 14:20 ` Andre Przywara
2014-07-28 15:23 ` Arnd Bergmann
2014-07-28 16:14 ` Andre Przywara
2014-07-29 9:17 ` Graeme Gregory
2014-07-29 10:07 ` Arnd Bergmann
2014-07-28 10:12 ` Mark Rutland
2014-07-28 16:33 ` Olof Johansson
2014-07-28 18:37 ` Mark Rutland
2014-07-28 18:44 ` Olof Johansson
2014-07-28 16:27 ` Olof Johansson
2014-07-28 17:00 ` Mark Rutland
2014-07-28 18:27 ` Olof Johansson
2014-08-12 18:23 ` Catalin Marinas
2014-08-13 23:41 ` Rafael J. Wysocki
2014-08-14 3:21 ` Hanjun Guo
2014-08-14 10:27 ` Catalin Marinas
2014-08-14 20:53 ` Arnd Bergmann
2014-08-15 1:02 ` Olof Johansson
2014-08-15 19:49 ` Arnd Bergmann
2014-08-15 23:19 ` Mark Brown
2014-08-16 12:51 ` graeme.gregory at linaro.org
2014-08-15 9:09 ` Hanjun Guo
2014-08-15 10:01 ` Catalin Marinas
2014-08-18 9:29 ` Hanjun Guo
2014-08-18 12:49 ` Mark Rutland
2014-08-20 22:17 ` Olof Johansson
2014-08-21 4:00 ` Hanjun Guo
2014-07-29 9:01 ` Hanjun Guo
2014-07-28 10:06 ` Mark Rutland
2014-07-28 16:44 ` Olof Johansson
2014-07-28 17:36 ` Mark Rutland
2014-07-28 18:34 ` Olof Johansson
2014-07-29 10:29 ` Christoffer Dall
2014-07-29 10:41 ` Arnd Bergmann
2014-07-29 10:55 ` Mark Rutland
2014-07-29 11:28 ` Mark Rutland
2014-07-29 12:37 ` Christoffer Dall
2014-07-29 12:52 ` Arnd Bergmann
2014-07-29 13:08 ` Mark Rutland
2014-07-29 13:31 ` Christoffer Dall
2014-07-29 14:04 ` Mark Rutland
2014-07-29 14:41 ` Arnd Bergmann
2014-07-29 15:01 ` Christoffer Dall
2014-07-30 6:47 ` Hanjun Guo
2014-07-30 7:14 ` Christoffer Dall
2014-07-30 9:36 ` Hanjun Guo
2014-07-29 13:33 ` Christoffer Dall
2014-07-29 7:58 ` Hanjun Guo
2014-07-29 10:30 ` Christoffer Dall
2014-08-15 22:43 ` Len Brown
2014-08-16 12:45 ` Graeme Gregory
2014-08-20 16:42 ` Grant Likely
2014-07-25 0:46 ` [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53D7CE79.1080809@arm.com \
--to=sudeep.holla@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).