Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/25724
Change subject: pci: Fix MMCONF_SUPPORT on non x86 ......................................................................
pci: Fix MMCONF_SUPPORT on non x86
Move x86 specific pci_bus_default_ops into arch/x86 folder. Fixes compilation on platforms that do neither have MMCONF_SUPPORT nor NO_MMCONF_SUPPORT.
Change-Id: I0991ab00c9a56b23cd012dd2b8b861f9737a9e9c Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/arch/x86/Makefile.inc M src/arch/x86/include/arch/pci_ops.h A src/arch/x86/pci_ops.c M src/device/pci_ops.c M src/include/device/pci_ops.h 5 files changed, 34 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/25724/1
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index cc529b2..ef9abe8 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -332,6 +332,7 @@ ramstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c ramstage-y += pci_ops_conf1.c +ramstage-y += pci_ops.c ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c ramstage-y += rdrand.c diff --git a/src/arch/x86/include/arch/pci_ops.h b/src/arch/x86/include/arch/pci_ops.h index 1b245aa..678edbb 100644 --- a/src/arch/x86/include/arch/pci_ops.h +++ b/src/arch/x86/include/arch/pci_ops.h @@ -19,8 +19,6 @@ extern const struct pci_bus_operations pci_cf8_conf1; extern const struct pci_bus_operations pci_ops_mmconf;
-const struct pci_bus_operations *pci_bus_default_ops(device_t dev); - #endif
#endif /* ARCH_I386_PCI_OPS_H */ diff --git a/src/arch/x86/pci_ops.c b/src/arch/x86/pci_ops.c new file mode 100644 index 0000000..85f7391 --- /dev/null +++ b/src/arch/x86/pci_ops.c @@ -0,0 +1,28 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018-present Facebook, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <device/device.h> +#include <device/pci_ops.h> + +const struct pci_bus_operations *pci_bus_default_ops(device_t dev) +{ +#if IS_ENABLED(CONFIG_MMCONF_SUPPORT) + return &pci_ops_mmconf; +#elif IS_ENABLED(CONFIG_NO_MMCONF_SUPPORT) + return &pci_cf8_conf1; +#else + return NULL; +#endif +} diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c index b6fc32d..64e50bf 100644 --- a/src/device/pci_ops.c +++ b/src/device/pci_ops.c @@ -20,12 +20,10 @@ #include <device/pci_ids.h> #include <device/pci_ops.h>
-const struct pci_bus_operations *pci_bus_default_ops(device_t dev) +const struct pci_bus_operations __attribute__((weak)) +*pci_bus_default_ops(device_t dev) { - if (IS_ENABLED(CONFIG_NO_MMCONF_SUPPORT)) - return &pci_cf8_conf1; - - return &pci_ops_mmconf; + return NULL; }
static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, struct device *dev) diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h index 3310e10..3a44824 100644 --- a/src/include/device/pci_ops.h +++ b/src/include/device/pci_ops.h @@ -15,4 +15,6 @@
#endif
+const struct pci_bus_operations *pci_bus_default_ops(device_t dev); + #endif /* PCI_OPS_H */