lkml.org 
[lkml]   [2006]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/3] add-force-of-use-mmconfig.patch
    This Patch add force for mmconfig. On Intel Macs the efi firmaware gives
    a different memory map then ACPI_MCFG provides. This makes the check wether
    to use mmconfig or not fail.

    Signed-off-by: Edgar Hucek <hostmaster@ed-soft.at>


    diff -uNr linux-2.6.18-rc3/arch/i386/Kconfig linux-2.6.18-rc3.mactel/arch/i386/Kconfig
    --- linux-2.6.18-rc3/arch/i386/Kconfig 2006-07-31 09:24:20.000000000 +0200
    +++ linux-2.6.18-rc3.mactel/arch/i386/Kconfig 2006-07-31 09:27:55.000000000 +0200
    @@ -1027,6 +1027,7 @@
    default y

    config PCI_MMCONFIG
    + depends on DMI
    bool
    depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
    default y
    diff -uNr linux-2.6.18-rc3/arch/i386/pci/mmconfig.c linux-2.6.18-rc3.mactel/arch/i386/pci/mmconfig.c
    --- linux-2.6.18-rc3/arch/i386/pci/mmconfig.c 2006-07-31 09:24:20.000000000 +0200
    +++ linux-2.6.18-rc3.mactel/arch/i386/pci/mmconfig.c 2006-07-31 09:27:57.000000000 +0200
    @@ -12,6 +12,8 @@
    #include <linux/pci.h>
    #include <linux/init.h>
    #include <linux/acpi.h>
    +#include <linux/dmi.h>
    +#include <linux/efi.h>
    #include <asm/e820.h>
    #include "pci.h"

    @@ -187,6 +189,54 @@
    }
    }

    +/*
    + * Print system on which MMCONFIG is forced.
    + */
    +
    +static int __init pci_mmcfg_force_system(struct dmi_system_id *id)
    +{
    + printk(KERN_INFO "PCI: System %s detected. Force MMCONFIG\n",
    + id->ident);
    +
    + return 0;
    +}
    +
    +/*
    + * DMI table of forced MMCONFIG systems.
    + */
    +
    +static struct dmi_system_id __initdata pci_mmcfg_dmi_system_apple[] = {
    + { pci_mmcfg_force_system, "iMac4,1", {
    + DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
    + DMI_MATCH(DMI_BIOS_VERSION,"iMac4,1") }},
    + { pci_mmcfg_force_system, "MacBookPro1,1", {
    + DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
    + DMI_MATCH(DMI_BIOS_VERSION,"MacBookPro1,1") }},
    + { pci_mmcfg_force_system, "MacBook1,1", {
    + DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
    + DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}},
    + { pci_mmcfg_force_system, "Macmini1,1", {
    + DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
    + DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}},
    + {},
    +};
    +
    +/*
    + * Check force MMCONFIG.
    + */
    +
    +int __init pci_mmcfg_force(void)
    +{
    + if (efi_enabled) {
    + if (dmi_check_system(pci_mmcfg_dmi_system_apple)) {
    + add_memory_region(pci_mmcfg_config[0].base_address,
    + pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN, E820_RESERVED);
    + return 1;
    + }
    + }
    + return 0;
    +}
    +
    void __init pci_mmcfg_init(void)
    {
    if ((pci_probe & PCI_PROBE_MMCONF) == 0)
    @@ -198,13 +248,15 @@
    (pci_mmcfg_config[0].base_address == 0))
    return;

    - if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
    - pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
    - E820_RESERVED)) {
    - printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
    - pci_mmcfg_config[0].base_address);
    - printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
    - return;
    + if (!pci_mmcfg_force()) {
    + if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
    + pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
    + E820_RESERVED)) {
    + printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
    + pci_mmcfg_config[0].base_address);
    + printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
    + return;
    + }
    }

    printk(KERN_INFO "PCI: Using MMCONFIG\n");

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-07-31 10:31    [W:0.025 / U:61.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site