From: Matthew Wilcox <willy@debian.org>
Adds support for MMCONFIG on i386 via ACPI tables.
---
25-akpm/arch/i386/Kconfig | 22 +++++--
25-akpm/arch/i386/kernel/acpi/boot.c | 36 +++++++++++
25-akpm/arch/i386/pci/Makefile | 1
25-akpm/arch/i386/pci/common.c | 9 ++
25-akpm/arch/i386/pci/mmconfig.c | 109 +++++++++++++++++++++++++++++++++++
25-akpm/arch/i386/pci/pci.h | 3
25-akpm/drivers/acpi/tables.c | 1
25-akpm/include/asm-i386/fixmap.h | 3
25-akpm/include/linux/acpi.h | 12 +++
9 files changed, 189 insertions(+), 7 deletions(-)
diff -puN arch/i386/Kconfig~mmconfig arch/i386/Kconfig
--- 25/arch/i386/Kconfig~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/arch/i386/Kconfig Fri Feb 27 15:21:34 2004
@@ -1078,12 +1078,16 @@ config PCI_GOBIOS
PCI-based systems don't have any BIOS at all. Linux can also try to
detect the PCI hardware directly without using the BIOS.
- With this option, you can specify how Linux should detect the PCI
- devices. If you choose "BIOS", the BIOS will be used, if you choose
- "Direct", the BIOS won't be used, and if you choose "Any", the
- kernel will try the direct access method and falls back to the BIOS
- if that doesn't work. If unsure, go with the default, which is
- "Any".
+ With this option, you can specify how Linux should detect the
+ PCI devices. If you choose "BIOS", the BIOS will be used,
+ if you choose "Direct", the BIOS won't be used, and if you
+ choose "MMConfig", then PCI Express MMCONFIG will be used.
+ If you choose "Any", the kernel will try MMCONFIG, then the
+ direct access method and falls back to the BIOS if that doesn't
+ work. If unsure, go with the default, which is "Any".
+
+config PCI_GOMMCONFIG
+ bool "MMConfig"
config PCI_GODIRECT
bool "Direct"
@@ -1103,6 +1107,12 @@ config PCI_DIRECT
depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
default y
+config PCI_MMCONFIG
+ bool
+ depends on PCI && (PCI_GOMMCONFIG || PCI_GOANY)
+ select ACPI_BOOT
+ default y
+
config PCI_USE_VECTOR
bool "Vector-based interrupt indexing (MSI)"
depends on X86_LOCAL_APIC && X86_IO_APIC
diff -puN arch/i386/kernel/acpi/boot.c~mmconfig arch/i386/kernel/acpi/boot.c
--- 25/arch/i386/kernel/acpi/boot.c~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/arch/i386/kernel/acpi/boot.c Fri Feb 27 15:21:34 2004
@@ -97,6 +97,31 @@ char *__acpi_map_table(unsigned long phy
}
+#ifdef CONFIG_PCI_MMCONFIG
+static int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
+{
+ struct acpi_table_mcfg *mcfg;
+
+ if (!phys_addr || !size)
+ return -EINVAL;
+
+ mcfg = (struct acpi_table_mcfg *) __acpi_map_table(phys_addr, size);
+ if (!mcfg) {
+ printk(KERN_WARNING PREFIX "Unable to map MCFG\n");
+ return -ENODEV;
+ }
+
+ if (mcfg->base_reserved) {
+ printk(KERN_ERR PREFIX "MMCONFIG not in low 4GB of memory\n");
+ return -ENODEV;
+ }
+
+ pci_mmcfg_base_addr = mcfg->base_address;
+
+ return 0;
+}
+#endif /* CONFIG_PCI_MMCONFIG */
+
#ifdef CONFIG_X86_LOCAL_APIC
static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
@@ -614,6 +639,17 @@ acpi_boot_init (void)
error = acpi_apic_setup();
+#ifdef CONFIG_PCI_MMCONFIG
+ result = acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg);
+ if (result < 0) {
+ printk(KERN_ERR PREFIX "Error %d parsing MCFG\n", result);
+ if (!error)
+ error = result;
+ } else if (result > 1) {
+ printk(KERN_WARNING PREFIX "Multiple MCFG tables exist\n");
+ }
+#endif /* CONFIG_PCI_MMCONFIG */
+
#ifdef CONFIG_HPET_TIMER
result = acpi_table_parse(ACPI_HPET, acpi_parse_hpet);
if (result < 0) {
diff -puN arch/i386/pci/common.c~mmconfig arch/i386/pci/common.c
--- 25/arch/i386/pci/common.c~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/arch/i386/pci/common.c Fri Feb 27 15:21:34 2004
@@ -20,7 +20,8 @@
extern void pcibios_sort(void);
#endif
-unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
+unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
+ PCI_PROBE_MMCONF;
int pcibios_last_bus = -1;
struct pci_bus *pci_root_bus = NULL;
@@ -198,6 +199,12 @@ char * __devinit pcibios_setup(char *st
return NULL;
}
#endif
+#ifdef CONFIG_PCI_MMCONFIG
+ else if (!strcmp(str, "nommconf")) {
+ pci_probe &= ~PCI_PROBE_MMCONF;
+ return NULL;
+ }
+#endif
else if (!strcmp(str, "noacpi")) {
acpi_noirq_set();
return NULL;
diff -puN arch/i386/pci/Makefile~mmconfig arch/i386/pci/Makefile
--- 25/arch/i386/pci/Makefile~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/arch/i386/pci/Makefile Fri Feb 27 15:21:34 2004
@@ -1,6 +1,7 @@
obj-y := i386.o
obj-$(CONFIG_PCI_BIOS) += pcbios.o
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
pci-y := fixup.o
diff -puN /dev/null arch/i386/pci/mmconfig.c
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/arch/i386/pci/mmconfig.c Fri Feb 27 15:21:34 2004
@@ -0,0 +1,109 @@
+/*
+ * mmconfig.c - Low-level direct PCI config space access via MMCONFIG
+ */
+
+#include <linux/pci.h>
+#include <linux/init.h>
+#include "pci.h"
+
+/* The physical address of the MMCONFIG aperture. Set from ACPI tables. */
+u32 pci_mmcfg_base_addr;
+
+#define mmcfg_virt_addr (fix_to_virt(FIX_PCIE_MCFG))
+
+/* The base address of the last MMCONFIG device accessed */
+static u32 mmcfg_last_accessed_device;
+
+/*
+ * Functions for accessing PCI configuration space with MMCONFIG accesses
+ */
+
+static inline void pci_exp_set_dev_base(int bus, int devfn)
+{
+ u32 dev_base = pci_mmcfg_base_addr | (bus << 20) | (devfn << 12);
+ if (dev_base != mmcfg_last_accessed_device) {
+ mmcfg_last_accessed_device = dev_base;
+ set_fixmap(FIX_PCIE_MCFG, dev_base);
+ }
+}
+
+static int pci_mmcfg_read(int seg, int bus, int devfn, int reg, int len, u32 *value)
+{
+ unsigned long flags;
+
+ if (!value || (bus > 255) || (devfn > 255) || (reg > 4095))
+ return -EINVAL;
+
+ spin_lock_irqsave(&pci_config_lock, flags);
+
+ pci_exp_set_dev_base(bus, devfn);
+
+ switch (len) {
+ case 1:
+ *value = readb(mmcfg_virt_addr + reg);
+ break;
+ case 2:
+ *value = readw(mmcfg_virt_addr + reg);
+ break;
+ case 4:
+ *value = readl(mmcfg_virt_addr + reg);
+ break;
+ }
+
+ spin_unlock_irqrestore(&pci_config_lock, flags);
+
+ return 0;
+}
+
+static int pci_mmcfg_write(int seg, int bus, int devfn, int reg, int len, u32 value)
+{
+ unsigned long flags;
+
+ if ((bus > 255) || (devfn > 255) || (reg > 4095))
+ return -EINVAL;
+
+ spin_lock_irqsave(&pci_config_lock, flags);
+
+ pci_exp_set_dev_base(bus, devfn);
+
+ switch (len) {
+ case 1:
+ writeb(value, mmcfg_virt_addr + reg);
+ break;
+ case 2:
+ writew(value, mmcfg_virt_addr + reg);
+ break;
+ case 4:
+ writel(value, mmcfg_virt_addr + reg);
+ break;
+ }
+
+ /* Dummy read to flush PCI write */
+ readl(mmcfg_virt_addr);
+
+ spin_unlock_irqrestore(&pci_config_lock, flags);
+
+ return 0;
+}
+
+static struct pci_raw_ops pci_mmcfg = {
+ .read = pci_mmcfg_read,
+ .write = pci_mmcfg_write,
+};
+
+static int __init pci_mmcfg_init(void)
+{
+ if ((pci_probe & PCI_PROBE_MMCONF) == 0)
+ goto out;
+ if (!pci_mmcfg_base_addr)
+ goto out;
+
+ printk(KERN_INFO "PCI: Using MMCONFIG\n");
+ raw_pci_ops = &pci_mmcfg;
+ pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
+
+ out:
+ return 0;
+}
+
+arch_initcall(pci_mmcfg_init);
diff -puN arch/i386/pci/pci.h~mmconfig arch/i386/pci/pci.h
--- 25/arch/i386/pci/pci.h~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/arch/i386/pci/pci.h Fri Feb 27 15:21:34 2004
@@ -15,6 +15,9 @@
#define PCI_PROBE_BIOS 0x0001
#define PCI_PROBE_CONF1 0x0002
#define PCI_PROBE_CONF2 0x0004
+#define PCI_PROBE_MMCONF 0x0008
+#define PCI_PROBE_MASK 0x000f
+
#define PCI_NO_SORT 0x0100
#define PCI_BIOS_SORT 0x0200
#define PCI_NO_CHECKS 0x0400
diff -puN drivers/acpi/tables.c~mmconfig drivers/acpi/tables.c
--- 25/drivers/acpi/tables.c~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/drivers/acpi/tables.c Fri Feb 27 15:21:34 2004
@@ -58,6 +58,7 @@ static char *acpi_table_signatures[ACPI_
[ACPI_SSDT] = "SSDT",
[ACPI_SPMI] = "SPMI",
[ACPI_HPET] = "HPET",
+ [ACPI_MCFG] = "MCFG",
};
static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
diff -puN include/asm-i386/fixmap.h~mmconfig include/asm-i386/fixmap.h
--- 25/include/asm-i386/fixmap.h~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/include/asm-i386/fixmap.h Fri Feb 27 15:21:34 2004
@@ -71,6 +71,9 @@ enum fixed_addresses {
FIX_ACPI_BEGIN,
FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
#endif
+#ifdef CONFIG_PCI_MMCONFIG
+ FIX_PCIE_MCFG,
+#endif
__end_of_permanent_fixed_addresses,
/* temporary boot-time mappings, used before ioremap() is functional */
#define NR_FIX_BTMAPS 16
diff -puN include/linux/acpi.h~mmconfig include/linux/acpi.h
--- 25/include/linux/acpi.h~mmconfig Fri Feb 27 15:21:34 2004
+++ 25-akpm/include/linux/acpi.h Fri Feb 27 15:21:34 2004
@@ -317,6 +317,15 @@ struct acpi_table_ecdt {
char ec_id[0];
} __attribute__ ((packed));
+/* PCI MMCONFIG */
+
+struct acpi_table_mcfg {
+ struct acpi_table_header header;
+ u8 reserved[8];
+ u32 base_address;
+ u32 base_reserved;
+} __attribute__ ((packed));
+
/* Table Handlers */
enum acpi_table_id {
@@ -338,6 +347,7 @@ enum acpi_table_id {
ACPI_SSDT,
ACPI_SPMI,
ACPI_HPET,
+ ACPI_MCFG,
ACPI_TABLE_COUNT
};
@@ -369,6 +379,8 @@ void acpi_numa_arch_fixup(void);
extern int acpi_mp_config;
+extern u32 pci_mmcfg_base_addr;
+
#else /*!CONFIG_ACPI_BOOT*/
#define acpi_mp_config 0
_