summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/Makefile.inc3
-rw-r--r--src/arch/x86/include/arch/pci_ops.h1
-rw-r--r--src/arch/x86/pci_ops.c5
-rw-r--r--src/arch/x86/pci_ops_mmconf.c73
4 files changed, 2 insertions, 80 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index df054f8748..f94e5478be 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -346,8 +346,7 @@ ramstage-y += memset.c
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_NO_MMCONF_SUPPORT) += pci_ops.c
ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c
ramstage-y += rdrand.c
ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c
diff --git a/src/arch/x86/include/arch/pci_ops.h b/src/arch/x86/include/arch/pci_ops.h
index 678edbb63c..3f1515e8f0 100644
--- a/src/arch/x86/include/arch/pci_ops.h
+++ b/src/arch/x86/include/arch/pci_ops.h
@@ -17,7 +17,6 @@
#ifndef __SIMPLE_DEVICE__
extern const struct pci_bus_operations pci_cf8_conf1;
-extern const struct pci_bus_operations pci_ops_mmconf;
#endif
diff --git a/src/arch/x86/pci_ops.c b/src/arch/x86/pci_ops.c
index 4fd916c865..82f9fd2644 100644
--- a/src/arch/x86/pci_ops.c
+++ b/src/arch/x86/pci_ops.c
@@ -18,8 +18,5 @@
const struct pci_bus_operations *pci_bus_default_ops(struct device *dev)
{
- if (IS_ENABLED(CONFIG_NO_MMCONF_SUPPORT))
- return &pci_cf8_conf1;
-
- return &pci_ops_mmconf;
+ return &pci_cf8_conf1;
}
diff --git a/src/arch/x86/pci_ops_mmconf.c b/src/arch/x86/pci_ops_mmconf.c
deleted file mode 100644
index cf08e17be4..0000000000
--- a/src/arch/x86/pci_ops_mmconf.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * 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 <console/console.h>
-#include <arch/io.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-
-/*
- * Functions for accessing PCI configuration space with mmconf accesses
- */
-
-#define PCI_MMIO_ADDR(SEGBUS, DEVFN, WHERE, MASK) \
- ((void *)(((uintptr_t)CONFIG_MMCONF_BASE_ADDRESS |\
- (((SEGBUS) & 0xFFF) << 20) |\
- (((DEVFN) & 0xFF) << 12) |\
- ((WHERE) & 0xFFF)) & ~MASK))
-
-static uint8_t pci_mmconf_read_config8(struct bus *pbus, int bus, int devfn,
- int where)
-{
- return read8(PCI_MMIO_ADDR(bus, devfn, where, 0));
-}
-
-static uint16_t pci_mmconf_read_config16(struct bus *pbus, int bus, int devfn,
- int where)
-{
- return read16(PCI_MMIO_ADDR(bus, devfn, where, 1));
-}
-
-static uint32_t pci_mmconf_read_config32(struct bus *pbus, int bus, int devfn,
- int where)
-{
- return read32(PCI_MMIO_ADDR(bus, devfn, where, 3));
-}
-
-static void pci_mmconf_write_config8(struct bus *pbus, int bus, int devfn,
- int where, uint8_t value)
-{
- write8(PCI_MMIO_ADDR(bus, devfn, where, 0), value);
-}
-
-static void pci_mmconf_write_config16(struct bus *pbus, int bus, int devfn,
- int where, uint16_t value)
-{
- write16(PCI_MMIO_ADDR(bus, devfn, where, 1), value);
-}
-
-static void pci_mmconf_write_config32(struct bus *pbus, int bus, int devfn,
- int where, uint32_t value)
-{
- write32(PCI_MMIO_ADDR(bus, devfn, where, 3), value);
-}
-
-const struct pci_bus_operations pci_ops_mmconf = {
- .read8 = pci_mmconf_read_config8,
- .read16 = pci_mmconf_read_config16,
- .read32 = pci_mmconf_read_config32,
- .write8 = pci_mmconf_write_config8,
- .write16 = pci_mmconf_write_config16,
- .write32 = pci_mmconf_write_config32,
-};