| Message ID | 1451884403-21437-5-git-send-email-jchandra@broadcom.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi Jayachandran,
[auto build test ERROR on pm/linux-next]
[also build test ERROR on v4.4-rc8 next-20160104]
[cannot apply to pci/next]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Jayachandran-C/ACPI-based-PCI-support-for-arm64/20160104-125550
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
config: arm64-allmodconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm64
All errors (new ones prefixed by >>):
>> drivers/xen/pci.c:31:25: fatal error: asm/pci_x86.h: No such file or directory
#include <asm/pci_x86.h>
^
compilation terminated.
vim +31 drivers/xen/pci.c
e28c31a9 Weidong Han 2010-10-27 15 * Place - Suite 330, Boston, MA 02111-1307 USA.
e28c31a9 Weidong Han 2010-10-27 16 *
e28c31a9 Weidong Han 2010-10-27 17 * Author: Weidong Han <weidong.han@intel.com>
e28c31a9 Weidong Han 2010-10-27 18 */
e28c31a9 Weidong Han 2010-10-27 19
e28c31a9 Weidong Han 2010-10-27 20 #include <linux/pci.h>
55e901fc Jan Beulich 2011-09-22 21 #include <linux/acpi.h>
0b97b03d Ross Lagerwall 2015-04-09 22 #include <linux/pci-acpi.h>
e28c31a9 Weidong Han 2010-10-27 23 #include <xen/xen.h>
e28c31a9 Weidong Han 2010-10-27 24 #include <xen/interface/physdev.h>
e28c31a9 Weidong Han 2010-10-27 25 #include <xen/interface/xen.h>
e28c31a9 Weidong Han 2010-10-27 26
e28c31a9 Weidong Han 2010-10-27 27 #include <asm/xen/hypervisor.h>
e28c31a9 Weidong Han 2010-10-27 28 #include <asm/xen/hypercall.h>
e28c31a9 Weidong Han 2010-10-27 29 #include "../pci/pci.h"
b7ef4a6d Ben Hutchings 2013-12-31 30 #ifdef CONFIG_PCI_MMCONFIG
8deb3eb1 Konrad Rzeszutek Wilk 2013-10-25 @31 #include <asm/pci_x86.h>
b7ef4a6d Ben Hutchings 2013-12-31 32 #endif
e28c31a9 Weidong Han 2010-10-27 33
55e901fc Jan Beulich 2011-09-22 34 static bool __read_mostly pci_seg_supported = true;
55e901fc Jan Beulich 2011-09-22 35
e28c31a9 Weidong Han 2010-10-27 36 static int xen_add_device(struct device *dev)
e28c31a9 Weidong Han 2010-10-27 37 {
e28c31a9 Weidong Han 2010-10-27 38 int r;
e28c31a9 Weidong Han 2010-10-27 39 struct pci_dev *pci_dev = to_pci_dev(dev);
:::::: The code at line 31 was first introduced by commit
:::::: 8deb3eb1461e4cb136c88d03ec5a6729ccf2f933 xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.
:::::: TO: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
:::::: CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 871f217..8c93af2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -203,6 +203,9 @@ config PCI_DOMAINS_GENERIC config PCI_SYSCALL def_bool PCI +config PCI_MMCONFIG + def_bool PCI && ACPI + source "drivers/pci/Kconfig" source "drivers/pci/pcie/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index b3d098b..db0a6a9 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -17,6 +17,7 @@ #include <linux/mm.h> #include <linux/of_pci.h> #include <linux/of_platform.h> +#include <linux/pci-acpi.h> #include <linux/slab.h> #include <asm/pci-bridge.h> @@ -48,9 +49,22 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if (pci_has_flag(PCI_PROBE_ONLY)) return 0; +#ifdef CONFIG_ACPI + if (acpi_find_root_bridge_handle(dev)) + acpi_pci_irq_enable(dev); +#endif + return pci_enable_resources(dev, mask); } +void pcibios_disable_device(struct pci_dev *dev) +{ +#ifdef CONFIG_ACPI + if (acpi_find_root_bridge_handle(dev)) + acpi_pci_irq_disable(dev); +#endif +} + /* * Try to assign the IRQ number from DT when adding a new device */ @@ -62,15 +76,15 @@ int pcibios_add_device(struct pci_dev *dev) } /* - * raw_pci_read/write - Platform-specific PCI config space access. + * ACPI uses these - leave it to the generic ACPI PCI driver */ -int raw_pci_read(unsigned int domain, unsigned int bus, +int __weak raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 *val) { return -ENXIO; } -int raw_pci_write(unsigned int domain, unsigned int bus, +int __weak raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 val) { return -ENXIO; @@ -78,9 +92,19 @@ int raw_pci_write(unsigned int domain, unsigned int bus, #ifdef CONFIG_ACPI /* Root bridge scanning */ -struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) +struct pci_bus * __weak pci_acpi_scan_root(struct acpi_pci_root *root) { - /* TODO: Should be revisited when implementing PCI on ACPI */ return NULL; } + +void pcibios_add_bus(struct pci_bus *bus) +{ + acpi_pci_add_bus(bus); +} + +void pcibios_remove_bus(struct pci_bus *bus) +{ + acpi_pci_remove_bus(bus); +} + #endif
Add functions needed for ACPI support. pci_acpi_scan_root(), raw_pci_read and raw_pci_write are marked as weak so that it can be implemented by the generic ACPI PCI driver. pcibios_enable_device and pcibios_disable_device handle acpi irq enable and disable. And, pcibios_add_bus and pcibios_remove_bus have been added call the corresponding ACPI functions. Signed-off-by: Jayachandran C <jchandra@broadcom.com> --- arch/arm64/Kconfig | 3 +++ arch/arm64/kernel/pci.c | 34 +++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-)