X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmptable.c;h=103f46243d8cd3b89afa3fc44f97901f8e265908;hb=refs%2Fheads%2Fcoreboot;hp=6e0252414959cfc4f0df10578ce926c2f9ef54cf;hpb=8362699269d7b3c816981be0e306d7531aa3ea1d;p=seabios.git diff --git a/src/mptable.c b/src/mptable.c index 6e02524..103f462 100644 --- a/src/mptable.c +++ b/src/mptable.c @@ -1,6 +1,6 @@ // MPTable generation (on emulators) // -// Copyright (C) 2008,2009 Kevin O'Connor +// Copyright (C) 2008-2010 Kevin O'Connor // Copyright (C) 2006 Fabrice Bellard // // This file may be distributed under the terms of the GNU LGPLv3 license. @@ -21,9 +21,9 @@ mptable_init(void) dprintf(3, "init MPTable\n"); // Config structure in temp area. - struct mptable_config_s *config = malloc_tmphigh(32*1024); + struct mptable_config_s *config = malloc_tmp(32*1024); if (!config) { - dprintf(1, "No space for temp mptable\n"); + warn_noalloc(); return; } memset(config, 0, sizeof(*config)); @@ -36,6 +36,11 @@ mptable_init(void) // Detect cpu info u32 cpuid_signature, ebx, ecx, cpuid_features; cpuid(1, &cpuid_signature, &ebx, &ecx, &cpuid_features); + if (! cpuid_signature) { + // Use default values. + cpuid_signature = 0x600; + cpuid_features = 0x201; + } int pkgcpus = 1; if (cpuid_features & (1 << 28)) { /* Only populate the MPS tables with the first logical CPU in @@ -43,6 +48,7 @@ mptable_init(void) pkgcpus = (ebx >> 16) & 0xff; pkgcpus = 1 << (__fls(pkgcpus - 1) + 1); /* round up to power of 2 */ } + u8 apic_version = readl((u8*)BUILD_APIC_ADDR + 0x30) & 0xff; // CPU definitions. struct mpt_cpu *cpus = (void*)&config[1], *cpu = cpus; @@ -51,38 +57,43 @@ mptable_init(void) memset(cpu, 0, sizeof(*cpu)); cpu->type = MPT_TYPE_CPU; cpu->apicid = i; - cpu->apicver = 0x11; + cpu->apicver = apic_version; /* cpu flags: enabled, bootstrap cpu */ - cpu->cpuflag = (i < CountCPUs) | ((i == 0) << 1); - if (cpuid_signature) { - cpu->cpusignature = cpuid_signature; - cpu->featureflag = cpuid_features; - } else { - cpu->cpusignature = 0x600; - cpu->featureflag = 0x201; - } + cpu->cpuflag = ((icpusignature = cpuid_signature; + cpu->featureflag = cpuid_features; cpu++; } int entrycount = cpu - cpus; + // PCI buses + struct mpt_bus *buses = (void*)cpu, *bus = buses; + int lastbus = -1; + struct pci_device *pci; + foreachpci(pci) { + int curbus = pci_bdf_to_bus(pci->bdf); + if (curbus == lastbus) + continue; + lastbus = curbus; + memset(bus, 0, sizeof(*bus)); + bus->type = MPT_TYPE_BUS; + bus->busid = curbus; + memcpy(bus->bustype, "PCI ", sizeof(bus->bustype)); + bus++; + } + /* isa bus */ - struct mpt_bus *bus = (void*)cpu; + int isabusid; memset(bus, 0, sizeof(*bus)); bus->type = MPT_TYPE_BUS; - bus->busid = 1; + isabusid = bus->busid = lastbus + 1; memcpy(bus->bustype, "ISA ", sizeof(bus->bustype)); - entrycount++; - bus++; - memset(bus, 0, sizeof(*bus)); - bus->type = MPT_TYPE_BUS; - bus->busid = 0; - memcpy(bus->bustype, "PCI ", sizeof(bus->bustype)); - entrycount++; + entrycount += bus - buses; /* ioapic */ u8 ioapic_id = CountCPUs; - struct mpt_ioapic *ioapic = (void*)&bus[1]; + struct mpt_ioapic *ioapic = (void*)bus; memset(ioapic, 0, sizeof(*ioapic)); ioapic->type = MPT_TYPE_IOAPIC; ioapic->apicid = ioapic_id; @@ -93,16 +104,17 @@ mptable_init(void) /* irqs */ struct mpt_intsrc *intsrcs = (void*)&ioapic[1], *intsrc = intsrcs; - int bdf, max, dev = -1; - unsigned short mask = 0, pinmask; + int dev = -1; + unsigned short mask = 0, pinmask = 0; - foreachpci(bdf, max) { + foreachpci(pci) { + u16 bdf = pci->bdf; int pin = pci_config_readb(bdf, PCI_INTERRUPT_PIN); int irq = pci_config_readb(bdf, PCI_INTERRUPT_LINE); if (pin == 0) continue; - if (dev != pci_bdf_to_dev(bdf)) { - dev = pci_bdf_to_dev(bdf); + if (dev != pci_bdf_to_busdev(bdf)) { + dev = pci_bdf_to_busdev(bdf); pinmask = 0; } if (pinmask & (1 << pin)) /* pin was seen already */ @@ -113,8 +125,8 @@ mptable_init(void) intsrc->type = MPT_TYPE_INTSRC; intsrc->irqtype = 0; /* INT */ intsrc->irqflag = 1; /* active high */ - intsrc->srcbus = 0; /* PCI bus */ - intsrc->srcbusirq = (dev << 2) | (pin - 1); + intsrc->srcbus = pci_bdf_to_bus(bdf); /* PCI bus */ + intsrc->srcbusirq = (pci_bdf_to_dev(bdf) << 2) | (pin - 1); intsrc->dstapic = ioapic_id; intsrc->dstirq = irq; intsrc++; @@ -127,7 +139,7 @@ mptable_init(void) intsrc->type = MPT_TYPE_INTSRC; intsrc->irqtype = 0; /* INT */ intsrc->irqflag = 0; /* conform to bus spec */ - intsrc->srcbus = 1; /* ISA bus */ + intsrc->srcbus = isabusid; /* ISA bus */ intsrc->srcbusirq = i; intsrc->dstapic = ioapic_id; intsrc->dstirq = i; @@ -141,28 +153,26 @@ mptable_init(void) } intsrc++; } - entrycount += intsrc - intsrcs; /* Local interrupt assignment */ intsrc->type = MPT_TYPE_LOCAL_INT; intsrc->irqtype = 3; /* ExtINT */ intsrc->irqflag = 0; /* PO, EL default */ - intsrc->srcbus = 1; /* ISA */ + intsrc->srcbus = isabusid; /* ISA */ intsrc->srcbusirq = 0; intsrc->dstapic = 0; /* BSP == APIC #0 */ intsrc->dstirq = 0; /* LINTIN0 */ intsrc++; - entrycount++; intsrc->type = MPT_TYPE_LOCAL_INT; intsrc->irqtype = 1; /* NMI */ intsrc->irqflag = 0; /* PO, EL default */ - intsrc->srcbus = 1; /* ISA */ + intsrc->srcbus = isabusid; /* ISA */ intsrc->srcbusirq = 0; - intsrc->dstapic = 0; /* BSP == APIC #0 */ + intsrc->dstapic = 0xff; /* to all local APICs */ intsrc->dstirq = 1; /* LINTIN1 */ intsrc++; - entrycount++; + entrycount += intsrc - intsrcs; // Finalize config structure. int length = (void*)intsrc - (void*)config; @@ -170,11 +180,13 @@ mptable_init(void) config->length = length; config->checksum -= checksum(config, length); - // Allocate final memory locations + // Allocate final memory locations. (In theory the config + // structure can go in high memory, but Linux kernels before + // v2.6.30 crash with that.) struct mptable_config_s *finalconfig = malloc_fseg(length); struct mptable_floating_s *floating = malloc_fseg(sizeof(*floating)); if (!finalconfig || !floating) { - dprintf(1, "No room for MPTABLE!\n"); + warn_noalloc(); free(config); free(finalconfig); free(floating);