Index: kernel/genarch/src/acpi/acpi.c =================================================================== --- kernel/genarch/src/acpi/acpi.c (revision c5da138d8b8cc6946884f1cfd5912b1afb9fa5d6) +++ kernel/genarch/src/acpi/acpi.c (revision 263bda21cd3cd48db6a7af349e737c62847da815) @@ -33,7 +33,7 @@ /** * @file - * @brief Advanced Configuration and Power Interface (ACPI) initialization. - */ - + * @brief Advanced Configuration and Power Interface (ACPI) initialization. + */ + #include #include @@ -43,6 +43,6 @@ #include -#define RSDP_SIGNATURE "RSD PTR " -#define RSDP_REVISION_OFFS 15 +#define RSDP_SIGNATURE "RSD PTR " +#define RSDP_REVISION_OFFS 15 #define CMP_SIGNATURE(left, right) \ @@ -64,35 +64,34 @@ }; -static int rsdp_check(uint8_t *rsdp) { - struct acpi_rsdp *r = (struct acpi_rsdp *) rsdp; +static int rsdp_check(uint8_t *_rsdp) { + struct acpi_rsdp *rsdp = (struct acpi_rsdp *) _rsdp; + 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; +} + +int acpi_sdt_check(uint8_t *sdt) +{ + struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) sdt; uint8_t sum = 0; unsigned int i; - for (i = 0; i < 20; i++) - sum = (uint8_t) (sum + rsdp[i]); - - if (sum) - return 0; /* bad checksum */ - - if (r->revision == 0) - return 1; /* ACPI 1.0 */ - - for (; i < r->length; i++) - sum = (uint8_t) (sum + rsdp[i]); - + for (i = 0; i < hdr->length; i++) + sum = (uint8_t) (sum + sdt[i]); + return !sum; - -} - -int acpi_sdt_check(uint8_t *sdt) -{ - struct acpi_sdt_header *h = (struct acpi_sdt_header *) sdt; - uint8_t sum = 0; - unsigned int i; - - for (i = 0; i < h->length; i++) - sum = (uint8_t) (sum + sdt[i]); - - return !sum; } @@ -100,5 +99,6 @@ { page_table_lock(AS_KERNEL, true); - page_mapping_insert(AS_KERNEL, (uintptr_t) sdt, (uintptr_t) sdt, PAGE_NOT_CACHEABLE | PAGE_WRITE); + page_mapping_insert(AS_KERNEL, (uintptr_t) sdt, (uintptr_t) sdt, + PAGE_NOT_CACHEABLE | PAGE_WRITE); map_structure((uintptr_t) sdt, sdt->length); page_table_unlock(AS_KERNEL, true); @@ -107,20 +107,25 @@ static void configure_via_rsdt(void) { - unsigned int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint32_t); + size_t i; + size_t j; + 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) / sizeof(struct acpi_signature_map); j++) { - struct acpi_sdt_header *h = (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i]; - - map_sdt(h); - if (CMP_SIGNATURE(h->signature, signature_map[j].signature)) { - if (!acpi_sdt_check((uint8_t *) h)) - goto next; - *signature_map[j].sdt_ptr = h; - LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description); + for (j = 0; j < sizeof(signature_map) + / sizeof(struct acpi_signature_map); j++) { + struct acpi_sdt_header *hdr = + (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i]; + + map_sdt(hdr); + if (CMP_SIGNATURE(hdr->signature, signature_map[j].signature)) { + if (!acpi_sdt_check((uint8_t *) hdr)) + break; + + *signature_map[j].sdt_ptr = hdr; + LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, + signature_map[j].description); } } -next: - ; } } @@ -128,22 +133,26 @@ static void configure_via_xsdt(void) { - unsigned int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) / sizeof(uint64_t); + size_t i; + size_t j; + 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) / sizeof(struct acpi_signature_map); j++) { - struct acpi_sdt_header *h = (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); - - map_sdt(h); - if (CMP_SIGNATURE(h->signature, signature_map[j].signature)) { - if (!acpi_sdt_check((uint8_t *) h)) - goto next; - *signature_map[j].sdt_ptr = h; - LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description); + for (j = 0; j < sizeof(signature_map) + / sizeof(struct acpi_signature_map); j++) { + struct acpi_sdt_header *hdr = + (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); + + map_sdt(hdr); + if (CMP_SIGNATURE(hdr->signature, signature_map[j].signature)) { + if (!acpi_sdt_check((uint8_t *) hdr)) + break; + + *signature_map[j].sdt_ptr = hdr; + LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, + signature_map[j].description); } } -next: - ; - } - + } } @@ -151,7 +160,9 @@ { uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xe0000) }; - int i, j, length[2] = { 1024, 128*1024 }; + unsigned int i; + unsigned int j; + unsigned int length[2] = { 1024, 128 * 1024 }; uint64_t *sig = (uint64_t *) RSDP_SIGNATURE; - + /* * Find Root System Description Pointer @@ -159,9 +170,10 @@ * 2. search 128K starting at 0xe0000 */ - + addr[0] = (uint8_t *) PA2KA(ebda); for (i = (ebda ? 0 : 1); i < 2; i++) { for (j = 0; j < length[i]; j += 16) { - if (*((uint64_t *) &addr[i][j]) == *sig && rsdp_check(&addr[i][j])) { + if ((*((uint64_t *) &addr[i][j]) == *sig) + && (rsdp_check(&addr[i][j]))) { acpi_rsdp = (struct acpi_rsdp *) &addr[i][j]; goto rsdp_found; @@ -169,33 +181,34 @@ } } - + return; - + rsdp_found: - LOG("%p: ACPI Root System Description Pointer\n", acpi_rsdp); - - acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address; + LOG("%p: ACPI Root System Description Pointer", acpi_rsdp); + + acpi_rsdt = (struct acpi_rsdt *) ((uintptr_t) acpi_rsdp->rsdt_address); if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) 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((uint8_t *) acpi_rsdt)) { + + if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) { printf("RSDT: bad checksum\n"); return; } - if (acpi_xsdt && !acpi_sdt_check((uint8_t *) acpi_xsdt)) { + + if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) { printf("XSDT: bad checksum\n"); return; } - + if (acpi_xsdt) configure_via_xsdt(); else if (acpi_rsdt) configure_via_rsdt(); - }