Index: kernel/genarch/src/acpi/acpi.c =================================================================== --- kernel/genarch/src/acpi/acpi.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ kernel/genarch/src/acpi/acpi.c (revision 928a2cbbc75ddb1a52c2123f04217b3c916102ed) @@ -69,17 +69,17 @@ uint8_t sum = 0; uint32_t i; - + for (i = 0; i < 20; i++) sum = (uint8_t) (sum + _rsdp[i]); - + if (sum) return 0; /* bad checksum */ - + if (rsdp->revision == 0) return 1; /* ACPI 1.0 */ - + for (; i < rsdp->length; i++) sum = (uint8_t) (sum + _rsdp[i]); - + return !sum; } @@ -90,8 +90,8 @@ uint8_t sum = 0; unsigned int i; - + for (i = 0; i < hdr->length; i++) sum = (uint8_t) (sum + sdt[i]); - + return !sum; } @@ -109,5 +109,5 @@ vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt, vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE); - + // TODO: do not leak vtmp @@ -121,5 +121,5 @@ size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint32_t); - + for (i = 0; i < cnt; i++) { for (j = 0; j < sizeof(signature_map) @@ -127,10 +127,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i]; - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -147,5 +147,5 @@ size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint64_t); - + for (i = 0; i < cnt; i++) { for (j = 0; j < sizeof(signature_map) @@ -153,10 +153,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -174,5 +174,5 @@ unsigned int length[2] = { 1024, 128 * 1024 }; uint64_t *sig = (uint64_t *) RSDP_SIGNATURE; - + /* * Find Root System Description Pointer @@ -180,5 +180,5 @@ * 2. search 128K starting at 0xe0000 */ - + addr[0] = (uint8_t *) PA2KA(ebda); for (i = (ebda ? 0 : 1); i < 2; i++) { @@ -191,10 +191,10 @@ } } - + return; - + rsdp_found: LOG("%p: ACPI Root System Description Pointer", acpi_rsdp); - + uintptr_t acpi_rsdt_p = (uintptr_t) acpi_rsdp->rsdt_address; uintptr_t acpi_xsdt_p = 0; @@ -202,23 +202,23 @@ if (acpi_rsdp->revision) acpi_xsdt_p = (uintptr_t) acpi_rsdp->xsdt_address; - + if (acpi_rsdt_p) acpi_rsdt = (struct acpi_rsdt *) map_sdt( (struct acpi_sdt_header *) acpi_rsdt_p); - + if (acpi_xsdt_p) acpi_xsdt = (struct acpi_xsdt *) map_sdt( (struct acpi_sdt_header *) acpi_xsdt_p); - + if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) { log(LF_ARCH, LVL_ERROR, "RSDT: bad checksum"); return; } - + if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) { log(LF_ARCH, LVL_ERROR, "XSDT: bad checksum"); return; } - + if (acpi_xsdt) configure_via_xsdt(); Index: kernel/genarch/src/acpi/madt.c =================================================================== --- kernel/genarch/src/acpi/madt.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ kernel/genarch/src/acpi/madt.c (revision 928a2cbbc75ddb1a52c2123f04217b3c916102ed) @@ -83,5 +83,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id; @@ -91,5 +91,5 @@ { assert(i < madt_l_apic_entry_cnt); - + /* * FIXME: The current local APIC driver limits usable @@ -99,5 +99,5 @@ if (i > 7) return false; - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->flags & 0x1; @@ -107,5 +107,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id == @@ -117,5 +117,5 @@ if (irq >= sizeof(isa_irq_map) / sizeof(int)) return (int) irq; - + return isa_irq_map[irq]; } @@ -135,11 +135,11 @@ uint8_t typea = (*((struct madt_apic_header **) a))->type; uint8_t typeb = (*((struct madt_apic_header **) b))->type; - + if (typea > typeb) return 1; - + if (typea < typeb) return -1; - + return 0; } @@ -149,12 +149,12 @@ if (madt_l_apic_entry_cnt == 0) madt_l_apic_entry_index = i; - + madt_l_apic_entry_cnt++; - + if (!(la->flags & 0x1)) { /* Processor is unusable, skip it. */ return; } - + apic_id_mask |= 1 << la->apic_id; } @@ -169,5 +169,5 @@ /* Currently not supported */ } - + madt_io_apic_entry_cnt++; } @@ -177,5 +177,5 @@ { assert(override->source < sizeof(isa_irq_map) / sizeof(int)); - + isa_irq_map[override->source] = override->global_int; } @@ -186,7 +186,7 @@ (((uint8_t *) acpi_madt) + acpi_madt->header.length); struct madt_apic_header *hdr; - + l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address; - + /* Count MADT entries */ unsigned int madt_entries_index_cnt = 0; @@ -194,5 +194,5 @@ hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) madt_entries_index_cnt++; - + /* Create MADT APIC entries index array */ madt_entries_index = (struct madt_apic_header **) @@ -201,7 +201,7 @@ if (!madt_entries_index) panic("Memory allocation error."); - + size_t i = 0; - + for (hdr = acpi_madt->apic_header; hdr < end; hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) { @@ -209,14 +209,14 @@ i++; } - + /* Sort MADT index structure */ if (!gsort(madt_entries_index, madt_entries_index_cnt, sizeof(struct madt_apic_header *), madt_cmp, NULL)) panic("Sorting error."); - + /* Parse MADT entries */ for (i = 0; i < madt_entries_index_cnt; i++) { hdr = madt_entries_index[i]; - + switch (hdr->type) { case MADT_L_APIC: @@ -245,14 +245,14 @@ "MADT: Skipping reserved entry (type=%" PRIu8 ")", hdr->type); - + if (hdr->type >= MADT_RESERVED_OEM_BEGIN) log(LF_ARCH, LVL_NOTE, "MADT: Skipping OEM entry (type=%" PRIu8 ")", hdr->type); - + break; } } - + if (madt_l_apic_entry_cnt > 0) config.cpu_count = madt_l_apic_entry_cnt;