Changeset 7b3b571 in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2012-01-28T14:40:18Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dc9a3ba

Parents:

9970a5a (diff), 20de14d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

File:

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

kernel/genarch/src/acpi/acpi.c

@@ -39 +39 @@
 #include <genarch/acpi/madt.h>
 #include <arch/bios/bios.h>
-#include <mm/as.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <print.h>
 
@@ -96 +96 @@
 }
 
-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);
-        map_structure((uintptr_t) sdt, sdt->length);
-        page_table_unlock(AS_KERNEL, true);
+static struct acpi_sdt_header *map_sdt(struct acpi_sdt_header *psdt)
+{
+        struct acpi_sdt_header *vhdr;
+        struct acpi_sdt_header *vsdt;
+
+        /* Start with mapping the header only. */
+        vhdr = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+            sizeof(struct acpi_sdt_header), PAGE_READ | PAGE_NOT_CACHEABLE); 
+
+        /* Now we can map the entire structure. */
+        vsdt = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+            vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        
+        // TODO: do not leak vtmp
+
+        return vsdt; 
 }
 
@@ -118 +127 @@
                             (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))
+                        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 = hdr;
+                                *signature_map[j].sdt_ptr = vhdr;
                                 LOG("%p: ACPI %s", *signature_map[j].sdt_ptr,
                                     signature_map[j].description);
@@ -144 +153 @@
                             (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))
+                        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 = hdr;
+                                *signature_map[j].sdt_ptr = vhdr;
                                 LOG("%p: ACPI %s", *signature_map[j].sdt_ptr,
                                     signature_map[j].description);
@@ -187 +196 @@
         LOG("%p: ACPI Root System Description Pointer", acpi_rsdp);
         
-        acpi_rsdt = (struct acpi_rsdt *) ((uintptr_t) acpi_rsdp->rsdt_address);
+        uintptr_t acpi_rsdt_p = (uintptr_t) acpi_rsdp->rsdt_address;
+        uintptr_t acpi_xsdt_p = 0;
+
         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);
+                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))) {