commit 6b815a95e4159143725c536c688948c6e561edb4
parent c0f485fdf9291715c964168f4549ca10bbdb78b9
Author: Brian Swetland <swetland@frotz.net>
Date: Sun, 5 Jan 2014 18:48:44 -0800
Add minimal ACPI support -- locate CPUs, LAPICs, and IOAPICs
This will fail if the BIOS puts the ACPI tables above 2GB physical
because that's all the memory we have mapped at the moment.
This is able to find HT cores, which are not listed in the
BIOS MP tables used by mpinit().
Diffstat:
4 files changed, 242 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
@@ -26,6 +26,7 @@ OBJS := \
kobj/log.o\
kobj/main.o\
kobj/mp.o\
+ kobj/acpi.o\
kobj/picirq.o\
kobj/pipe.o\
kobj/proc.o\
diff --git a/include/acpi.h b/include/acpi.h
@@ -0,0 +1,72 @@
+// References: ACPI 5.0 Errata A
+// http://acpi.info/spec.htm
+
+// 5.2.5.3
+#define SIG_RDSP "RSD PTR "
+struct acpi_rdsp {
+ uchar signature[8];
+ uchar checksum;
+ uchar oem_id[6];
+ uchar revision;
+ uint32 rsdt_addr_phys;
+ uint32 length;
+ uint64 xsdt_addr_phys;
+ uchar xchecksum;
+ uchar reserved[3];
+} __attribute__((__packed__));
+
+// 5.2.6
+struct acpi_desc_header {
+ uchar signature[4];
+ uint32 length;
+ uchar revision;
+ uchar checksum;
+ uchar oem_id[6];
+ uchar oem_tableid[8];
+ uint32 oem_revision;
+ uchar creator_id[4];
+ uint32 creator_revision;
+} __attribute__((__packed__));
+
+// 5.2.7
+struct acpi_rsdt {
+ struct acpi_desc_header header;
+ uint32 entry[0];
+} __attribute__((__packed__));
+
+#define TYPE_LAPIC 0
+#define TYPE_IOAPIC 1
+#define TYPE_INT_SRC_OVERRIDE 2
+#define TYPE_NMI_INT_SRC 3
+#define TYPE_LAPIC_NMI 4
+
+// 5.2.12 Multiple APIC Description Table
+#define SIG_MADT "APIC"
+struct acpi_madt {
+ struct acpi_desc_header header;
+ uint32 lapic_addr_phys;
+ uint32 flags;
+ uchar table[0];
+} __attribute__((__packed__));
+
+// 5.2.12.2
+#define APIC_LAPIC_ENABLED 1
+struct madt_lapic {
+ uchar type;
+ uchar length;
+ uchar acpi_id;
+ uchar apic_id;
+ uint32 flags;
+} __attribute__((__packed__));
+
+// 5.2.12.3
+struct madt_ioapic {
+ uchar type;
+ uchar length;
+ uchar id;
+ uchar reserved;
+ uint32 addr;
+ uint32 interrupt_base;
+} __attribute__((__packed__));
+
+
diff --git a/include/defs.h b/include/defs.h
@@ -90,6 +90,9 @@ int mpbcpu(void);
void mpinit(void);
void mpstartthem(void);
+// apic.c
+int acpiinit(void);
+
// picirq.c
void picenable(int);
void picinit(void);
diff --git a/kernel/acpi.c b/kernel/acpi.c
@@ -0,0 +1,166 @@
+/* vm64.c
+ *
+ * Copyright (c) 2013 Brian Swetland
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "types.h"
+#include "defs.h"
+#include "param.h"
+#include "memlayout.h"
+#include "mp.h"
+#include "x86.h"
+#include "mmu.h"
+#include "proc.h"
+#include "acpi.h"
+
+extern struct cpu cpus[NCPU];
+extern int ismp;
+extern int ncpu;
+extern uchar ioapicid;
+
+static struct acpi_rdsp *scan_rdsp(uint base, uint len) {
+ uchar *p;
+ for (p = p2v(base); len >= sizeof(struct acpi_rdsp); len -= 4, p += 4) {
+ if (memcmp(p, SIG_RDSP, 8) == 0) {
+ uint sum, n;
+ for (sum = 0, n = 0; n < 20; n++)
+ sum += p[n];
+ if ((sum & 0xff) == 0)
+ return (struct acpi_rdsp *) p;
+ }
+ }
+ return (struct acpi_rdsp *) 0;
+}
+
+static struct acpi_rdsp *find_rdsp(void) {
+ struct acpi_rdsp *rdsp;
+ uintp pa;
+ pa = *((ushort*) P2V(0x40E)) << 4; // EBDA
+ if (pa && (rdsp = scan_rdsp(pa, 1024)))
+ return rdsp;
+ return scan_rdsp(0xE0000, 0x20000);
+}
+
+static int acpi_config_smp(struct acpi_madt *madt) {
+ uint32 lapic_addr;
+ uint nioapic = 0;
+ uchar *p, *e;
+
+ if (!madt)
+ return -1;
+ if (madt->header.length < sizeof(struct acpi_madt))
+ return -1;
+
+ lapic_addr = madt->lapic_addr_phys;
+
+ p = madt->table;
+ e = p + madt->header.length - sizeof(struct acpi_madt);
+
+ while (p < e) {
+ uint len;
+ if ((e - p) < 2)
+ break;
+ len = p[1];
+ if ((e - p) < len)
+ break;
+ switch (p[0]) {
+ case TYPE_LAPIC: {
+ struct madt_lapic *lapic = (void*) p;
+ if (len < sizeof(*lapic))
+ break;
+ if (!(lapic->flags & APIC_LAPIC_ENABLED))
+ break;
+ cprintf("acpi: cpu#%d apicid %d\n", ncpu, lapic->apic_id);
+ cpus[ncpu].id = ncpu;
+ cpus[ncpu].apicid = lapic->apic_id;
+ ncpu++;
+ break;
+ }
+ case TYPE_IOAPIC: {
+ struct madt_ioapic *ioapic = (void*) p;
+ if (len < sizeof(*ioapic))
+ break;
+ cprintf("acpi: ioapic#%d @%x id=%d base=%d\n",
+ nioapic, ioapic->addr, ioapic->id, ioapic->interrupt_base);
+ if (nioapic) {
+ cprintf("warning: multiple ioapics are not supported");
+ } else {
+ ioapicid = ioapic->id;
+ }
+ nioapic++;
+ break;
+ }
+ }
+ p += len;
+ }
+
+ if (ncpu) {
+ ismp = 1;
+ lapic = IO2V(((uintp)lapic_addr));
+ return 0;
+ }
+
+ return -1;
+}
+
+#if X64
+#define PHYSLIMIT 0x80000000
+#else
+#define PHYSLIMIT 0x0E000000
+#endif
+
+int acpiinit(void) {
+ unsigned n, count;
+ struct acpi_rdsp *rdsp;
+ struct acpi_rsdt *rsdt;
+ struct acpi_madt *madt = 0;
+
+ rdsp = find_rdsp();
+ if (rdsp->rsdt_addr_phys > PHYSLIMIT)
+ goto notmapped;
+ rsdt = p2v(rdsp->rsdt_addr_phys);
+ count = (rsdt->header.length - sizeof(*rsdt)) / 4;
+ for (n = 0; n < count; n++) {
+ struct acpi_desc_header *hdr = p2v(rsdt->entry[n]);
+ if (rsdt->entry[n] > PHYSLIMIT)
+ goto notmapped;
+#if DEBUG
+ uchar sig[5], id[7], tableid[9], creator[5];
+ memmove(sig, hdr->signature, 4); sig[4] = 0;
+ memmove(id, hdr->oem_id, 6); id[6] = 0;
+ memmove(tableid, hdr->oem_tableid, 8); tableid[8] = 0;
+ memmove(creator, hdr->creator_id, 4); creator[4] = 0;
+ cprintf("acpi: %s %s %s %x %s %x\n",
+ sig, id, tableid, hdr->oem_revision,
+ creator, hdr->creator_revision);
+#endif
+ if (!memcmp(hdr->signature, SIG_MADT, 4))
+ madt = (void*) hdr;
+ }
+
+ return acpi_config_smp(madt);
+
+notmapped:
+ cprintf("acpi: tables above 0x%x not mapped.\n", PHYSLIMIT);
+ return -1;
+}
