X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmptable.c;h=103f46243d8cd3b89afa3fc44f97901f8e265908;hb=refs%2Fheads%2Fcoreboot;hp=47aee24bb227b0ca542465dcae5758416a7f4563;hpb=e97ca7bd12d1ad394620d606747e423ee7cfd9ce;p=seabios.git diff --git a/src/mptable.c b/src/mptable.c index 47aee24..103f462 100644 --- a/src/mptable.c +++ b/src/mptable.c @@ -1,14 +1,16 @@ // MPTable generation (on emulators) // -// Copyright (C) 2008 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. #include "util.h" // dprintf -#include "memmap.h" // bios_table_cur_addr #include "config.h" // CONFIG_* #include "mptable.h" // MPTABLE_SIGNATURE +#include "paravirt.h" // qemu_cfg_irq0_override +#include "pci.h" +#include "pci_regs.h" void mptable_init(void) @@ -18,96 +20,189 @@ mptable_init(void) dprintf(3, "init MPTable\n"); - int smp_cpus = CountCPUs; - if (smp_cpus <= 1) - // Building an mptable on uniprocessor machines confuses some OSes. - return; - - u32 start = ALIGN(bios_table_cur_addr, 16); - int length = (sizeof(struct mptable_floating_s) - + sizeof(struct mptable_config_s) - + sizeof(struct mpt_cpu) * smp_cpus - + sizeof(struct mpt_bus) - + sizeof(struct mpt_ioapic) - + sizeof(struct mpt_intsrc) * 16); - if (start + length > bios_table_end_addr) { - dprintf(1, "No room for MPTABLE!\n"); + // Config structure in temp area. + struct mptable_config_s *config = malloc_tmp(32*1024); + if (!config) { + warn_noalloc(); return; } - bios_table_cur_addr = start + length; - - /* floating pointer structure */ - struct mptable_floating_s *floating = (void*)start; - memset(floating, 0, sizeof(*floating)); - struct mptable_config_s *config = (void*)&floating[1]; - floating->signature = MPTABLE_SIGNATURE; - floating->physaddr = (u32)config; - floating->length = 1; - floating->spec_rev = 4; - floating->checksum = -checksum(floating, sizeof(*floating)); - - // Config structure. memset(config, 0, sizeof(*config)); config->signature = MPCONFIG_SIGNATURE; - config->length = length - sizeof(*floating); config->spec = 4; memcpy(config->oemid, CONFIG_CPUNAME8, sizeof(config->oemid)); memcpy(config->productid, "0.1 ", sizeof(config->productid)); - config->entrycount = smp_cpus + 2 + 16; config->lapic = BUILD_APIC_ADDR; - // CPU definitions. + // Detect cpu info u32 cpuid_signature, ebx, ecx, cpuid_features; cpuid(1, &cpuid_signature, &ebx, &ecx, &cpuid_features); - struct mpt_cpu *cpus = (void*)&config[1]; + 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 + each package */ + 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; int i; - for (i = 0; i < smp_cpus; i++) { - struct mpt_cpu *cpu = &cpus[i]; + for (i = 0; i < MaxCountCPUs; i+=pkgcpus) { 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 == 0 ? 3 : 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*)&cpus[smp_cpus]; + int isabusid; memset(bus, 0, sizeof(*bus)); bus->type = MPT_TYPE_BUS; + isabusid = bus->busid = lastbus + 1; memcpy(bus->bustype, "ISA ", sizeof(bus->bustype)); + bus++; + entrycount += bus - buses; /* ioapic */ - u8 ioapic_id = smp_cpus; - struct mpt_ioapic *ioapic = (void*)&bus[1]; + u8 ioapic_id = CountCPUs; + struct mpt_ioapic *ioapic = (void*)bus; memset(ioapic, 0, sizeof(*ioapic)); ioapic->type = MPT_TYPE_IOAPIC; ioapic->apicid = ioapic_id; ioapic->apicver = 0x11; ioapic->flags = 1; // enable ioapic->apicaddr = BUILD_IOAPIC_ADDR; + entrycount++; /* irqs */ - struct mpt_intsrc *intsrcs = (void *)&ioapic[1]; - for(i = 0; i < 16; i++) { - struct mpt_intsrc *isrc = &intsrcs[i]; - memset(isrc, 0, sizeof(*isrc)); - isrc->type = MPT_TYPE_INTSRC; - isrc->srcbusirq = i; - isrc->dstapic = ioapic_id; - isrc->dstirq = i; + struct mpt_intsrc *intsrcs = (void*)&ioapic[1], *intsrc = intsrcs; + int dev = -1; + unsigned short mask = 0, pinmask = 0; + + 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_busdev(bdf)) { + dev = pci_bdf_to_busdev(bdf); + pinmask = 0; + } + if (pinmask & (1 << pin)) /* pin was seen already */ + continue; + pinmask |= (1 << pin); + mask |= (1 << irq); + memset(intsrc, 0, sizeof(*intsrc)); + intsrc->type = MPT_TYPE_INTSRC; + intsrc->irqtype = 0; /* INT */ + intsrc->irqflag = 1; /* active high */ + 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++; + } + + for (i = 0; i < 16; i++) { + memset(intsrc, 0, sizeof(*intsrc)); + if (mask & (1 << i)) + continue; + intsrc->type = MPT_TYPE_INTSRC; + intsrc->irqtype = 0; /* INT */ + intsrc->irqflag = 0; /* conform to bus spec */ + intsrc->srcbus = isabusid; /* ISA bus */ + intsrc->srcbusirq = i; + intsrc->dstapic = ioapic_id; + intsrc->dstirq = i; + if (qemu_cfg_irq0_override()) { + /* Destination 2 is covered by irq0->inti2 override (i == + 0). Source IRQ 2 is unused */ + if (i == 0) + intsrc->dstirq = 2; + else if (i == 2) + intsrc--; + } + intsrc++; + } + + /* Local interrupt assignment */ + intsrc->type = MPT_TYPE_LOCAL_INT; + intsrc->irqtype = 3; /* ExtINT */ + intsrc->irqflag = 0; /* PO, EL default */ + intsrc->srcbus = isabusid; /* ISA */ + intsrc->srcbusirq = 0; + intsrc->dstapic = 0; /* BSP == APIC #0 */ + intsrc->dstirq = 0; /* LINTIN0 */ + intsrc++; + + intsrc->type = MPT_TYPE_LOCAL_INT; + intsrc->irqtype = 1; /* NMI */ + intsrc->irqflag = 0; /* PO, EL default */ + intsrc->srcbus = isabusid; /* ISA */ + intsrc->srcbusirq = 0; + intsrc->dstapic = 0xff; /* to all local APICs */ + intsrc->dstirq = 1; /* LINTIN1 */ + intsrc++; + entrycount += intsrc - intsrcs; + + // Finalize config structure. + int length = (void*)intsrc - (void*)config; + config->entrycount = entrycount; + config->length = length; + config->checksum -= checksum(config, length); + + // 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) { + warn_noalloc(); + free(config); + free(finalconfig); + free(floating); + return; } + memcpy(finalconfig, config, length); + free(config); - // Set checksum. - config->checksum = -checksum(config, config->length); + /* floating pointer structure */ + memset(floating, 0, sizeof(*floating)); + floating->signature = MPTABLE_SIGNATURE; + floating->physaddr = (u32)finalconfig; + floating->length = 1; + floating->spec_rev = 4; + floating->checksum -= checksum(floating, sizeof(*floating)); - dprintf(1, "MP table addr=0x%x MPC table addr=0x%x size=0x%x\n", - (u32)floating, (u32)config, length); + dprintf(1, "MP table addr=%p MPC table addr=%p size=%d\n", + floating, finalconfig, length); }