Index: arch/ia32/Makefile.inc =================================================================== --- arch/ia32/Makefile.inc (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ arch/ia32/Makefile.inc (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -25,4 +25,5 @@ arch/proc/scheduler.c \ arch/acpi/acpi.c \ + arch/acpi/madt.c \ arch/bios/bios.c \ arch/smp/ap.S \ Index: arch/ia32/include/acpi/acpi.h =================================================================== --- arch/ia32/include/acpi/acpi.h (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ arch/ia32/include/acpi/acpi.h (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -58,4 +58,10 @@ } __attribute__ ((packed));; +struct acpi_signature_map { + __u8 *signature; + struct acpi_sdt_header **sdt_ptr; + char *description; +}; + /* Root System Description Table */ struct acpi_rsdt { @@ -71,8 +77,13 @@ extern struct acpi_rsdp *acpi_rsdp; +extern struct acpi_rsdt *acpi_rsdt; +extern struct acpi_xsdt *acpi_xsdt; extern void acpi_init(void); - static int rsdp_check(__u8 *rsdp); +static void map_sdt(struct acpi_sdt_header *sdt); +extern int acpi_sdt_check(__u8 *sdt); +static void configure_via_rsdt(void); +static void configure_via_xsdt(void); #endif /* __ACPI_H__ */ Index: arch/ia32/src/acpi/acpi.c =================================================================== --- arch/ia32/src/acpi/acpi.c (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ arch/ia32/src/acpi/acpi.c (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -28,5 +28,8 @@ #include +#include #include + +#include #define RSDP_SIGNATURE "RSD PTR " @@ -34,4 +37,10 @@ struct acpi_rsdp *acpi_rsdp = NULL; +struct acpi_rsdt *acpi_rsdt = NULL; +struct acpi_xsdt *acpi_xsdt = NULL; + +struct acpi_signature_map signature_map[] = { + { "APIC", (struct acpi_sdt_header **) &acpi_madt, "Multiple APIC Description Table" } +}; int rsdp_check(__u8 *rsdp) { @@ -54,4 +63,21 @@ return !sum; +} + +int acpi_sdt_check(__u8 *sdt) +{ + struct acpi_sdt_header *h = (struct acpi_sdt_header *) sdt; + __u8 sum = 0; + int i; + + for (i=0; ilength; i++) + sum += sdt[i]; + + return !sum; +} + +void map_sdt(struct acpi_sdt_header *sdt) +{ + map_page_to_frame((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0); } @@ -81,4 +107,66 @@ rsdp_found: - printf("%L: ACPI Root System Description Pointer\n", acpi_rsdp); + printf("%L: ACPI Root System Description Pointer\n", acpi_rsdp); + + acpi_rsdt = (struct acpi_rsdt *) acpi_rsdp->rsdt_address; + if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((__address) acpi_rsdp->xsdt_address); + + if (acpi_rsdt) map_sdt((struct acpi_sdt_header *) acpi_rsdt); + if (acpi_xsdt) map_sdt((struct acpi_sdt_header *) acpi_xsdt); + + if (acpi_rsdt && !acpi_sdt_check((__u8 *) acpi_rsdt)) { + printf("RSDT: %s\n", "bad checksum"); + return; + } + if (acpi_xsdt && !acpi_sdt_check((__u8 *) acpi_xsdt)) { + printf("XSDT: %s\n", "bad checksum"); + return; + } + + if (acpi_xsdt) configure_via_xsdt(); + else if (acpi_rsdt) configure_via_rsdt(); + } + +void configure_via_rsdt(void) +{ + int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u32); + + for (i=0; ientry[i]; + + map_sdt(h); + if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) { + if (!acpi_sdt_check((__u8 *) h)) + goto next; + *signature_map[j].sdt_ptr = h; + printf("%L: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description); + } + } +next: + ; + } +} + +void configure_via_xsdt(void) +{ + int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u64); + + for (i=0; ientry[i]); + + map_sdt(h); + if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) { + if (!acpi_sdt_check((__u8 *) h)) + goto next; + *signature_map[j].sdt_ptr = h; + printf("%L: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description); + } + } +next: + ; + } + +} Index: arch/ia32/src/acpi/madt.c =================================================================== --- arch/ia32/src/acpi/madt.c (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) +++ arch/ia32/src/acpi/madt.c (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +struct acpi_madt *acpi_madt = NULL; Index: arch/ia32/src/interrupt.c =================================================================== --- arch/ia32/src/interrupt.c (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ arch/ia32/src/interrupt.c (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -87,5 +87,6 @@ printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack); printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]); - panic("page fault\n"); + printf("page fault\n"); + cpu_halt(); } Index: arch/ia32/src/smp/mp.c =================================================================== --- arch/ia32/src/smp/mp.c (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ arch/ia32/src/smp/mp.c (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -387,5 +387,5 @@ switch (cur[CT_EXT_ENTRY_TYPE]) { default: - printf("%X: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]); + printf("%L: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]); break; } Index: doc/requirements =================================================================== --- doc/requirements (revision babcb14871c9712680b4a8eaff315215bbc41404) +++ doc/requirements (revision 10a2e2286c964c27a26a6a74e033a32fa0c92749) @@ -11,5 +11,5 @@ SMP COMPATIBILITY - o Bochs 2.0.2 - Bochs 2.1 + o Bochs 2.0.2 - Bochs 2.2-cvs o 2x-8x 686 CPU o ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 @@ -17,6 +17,6 @@ EMULATORS AND VIRTUALIZERS - o Bochs 2.0.2 - Bochs 2.1 - o VMware Workstation 4 + o Bochs 2.0.2 - Bochs 2.2-cvs + o VMware Workstation 4, VMware Workstation 5