Changes in kernel/genarch/src/acpi/acpi.c [96b02eb9:103bb68] in mainline

File:

• kernel/genarch/src/acpi/acpi.c (modified) (8 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Advanced Configuration and Power Interface (ACPI) initialization.
+ * @brief       Advanced Configuration and Power Interface (ACPI) initialization.
  */
-
+ 
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -43 +43 @@
 #include <print.h>
 
-#define RSDP_SIGNATURE      "RSD PTR "
-#define RSDP_REVISION_OFFS  15
-
-#define CMP_SIGNATURE(left, right) \
-        (((left)[0] == (right)[0]) && \
-        ((left)[1] == (right)[1]) && \
-        ((left)[2] == (right)[2]) && \
-        ((left)[3] == (right)[3]))
+#define RSDP_SIGNATURE          "RSD PTR "
+#define RSDP_REVISION_OFFS      15
 
 struct acpi_rsdp *acpi_rsdp = NULL;
@@ -64 +58 @@
 };
 
-static int rsdp_check(uint8_t *_rsdp) {
-        struct acpi_rsdp *rsdp = (struct acpi_rsdp *) _rsdp;
+static int rsdp_check(uint8_t *rsdp) {
+        struct acpi_rsdp *r = (struct acpi_rsdp *) rsdp;
         uint8_t sum = 0;
-        uint32_t i;
+        unsigned int i;
         
         for (i = 0; i < 20; i++)
-                sum = (uint8_t) (sum + _rsdp[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]);
+                
+        return !sum;
         
-        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;
+        struct acpi_sdt_header *h = (struct acpi_sdt_header *) sdt;
         uint8_t sum = 0;
         unsigned int i;
-        
-        for (i = 0; i < hdr->length; i++)
+
+        for (i = 0; i < h->length; i++)
                 sum = (uint8_t) (sum + sdt[i]);
-        
+                
         return !sum;
 }
@@ -98 +93 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-        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);
 }
 
 static void configure_via_rsdt(void)
 {
-        size_t i;
-        size_t j;
-        size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))
-            / sizeof(uint32_t);
+        unsigned int i, j, 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 *hdr =
-                            (struct acpi_sdt_header *) (sysarg_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);
+                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 (*((uint32_t *) &h->signature[0]) == *((uint32_t *) &signature_map[j].signature[0])) {
+                                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);
                         }
                 }
+next:
+                ;
         }
 }
@@ -133 +120 @@
 static void configure_via_xsdt(void)
 {
-        size_t i;
-        size_t j;
-        size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))
-            / sizeof(uint64_t);
+        unsigned int i, j, 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 *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);
+                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_rsdt->entry[i]);
+
+                        map_sdt(h);
+                        if (*((uint32_t *) &h->signature[0]) == *((uint32_t *) &signature_map[j].signature[0])) {
+                                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);
                         }
                 }
+next:
+                ;
         }
+
 }
 
@@ -160 +143 @@
 {
         uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xe0000) };
-        unsigned int i;
-        unsigned int j;
-        unsigned int length[2] = { 1024, 128 * 1024 };
+        int i, j, length[2] = { 1024, 128*1024 };
         uint64_t *sig = (uint64_t *) RSDP_SIGNATURE;
-        
+
         /*
          * Find Root System Description Pointer
@@ -170 +151 @@
          * 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;
@@ -181 +161 @@
                 }
         }
-        
+
         return;
-        
+
 rsdp_found:
-        LOG("%p: ACPI Root System Description Pointer", acpi_rsdp);
-        
-        acpi_rsdt = (struct acpi_rsdt *) ((uintptr_t) acpi_rsdp->rsdt_address);
+        LOG("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
+
+        acpi_rsdt = (struct acpi_rsdt *) (unative_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();
+
 }