commit ff5f7921d904dd2ddbaded3941643da8ba5fa9aa
author Michael S. Tsirkin <mst@redhat.com> Thu Oct 03 16:30:35 2013 +0300
committer Gerd Hoffmann <kraxel@redhat.com> Wed Nov 06 12:24:57 2013 +0100
tree ac3898d6119e79142670557663db9b0c3f16801b
parent c21dce35058fd55e70d1d379dd0e62ec71f187aa

biostables: support looking up RSDP

Will be used when it's loaded from QEMU.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

src/fw/biostables.c

diff --git a/src/fw/biostables.c b/src/fw/biostables.c
index a3ee827..c7d498d 100644
--- a/src/fw/biostables.c
+++ b/src/fw/biostables.c
@@ -60,22 +60,35 @@
     memcpy((void*)newpos + length, (void*)p->physaddr, mpclength);
 }
 
+static int
+get_acpi_rsdp_length(void *pos, unsigned size)
+{
+    struct rsdp_descriptor *p = pos;
+    if (p->signature != RSDP_SIGNATURE)
+        return -1;
+    u32 length = 20;
+    if (length > size)
+        return -1;
+    if (checksum(pos, length) != 0)
+        return -1;
+    if (p->revision > 1) {
+        length = p->length;
+        if (length > size)
+            return -1;
+        if (checksum(pos, length) != 0)
+            return -1;
+    }
+    return length;
+}
+
 static void
 copy_acpi_rsdp(void *pos)
 {
     if (RsdpAddr)
         return;
-    struct rsdp_descriptor *p = pos;
-    if (p->signature != RSDP_SIGNATURE)
+    int length = get_acpi_rsdp_length(pos, -1);
+    if (length < 0)
         return;
-    u32 length = 20;
-    if (checksum(pos, length) != 0)
-        return;
-    if (p->revision > 1) {
-        length = p->length;
-        if (checksum(pos, length) != 0)
-            return;
-    }
     void *newpos = malloc_fseg(length);
     if (!newpos) {
         warn_noalloc();
@@ -118,3 +131,17 @@
     copy_acpi_rsdp(pos);
     copy_smbios(pos);
 }
+
+void *find_acpi_rsdp(void)
+{
+    extern u8 zonefseg_start[], zonefseg_end[];
+    unsigned long start = (unsigned long)zonefseg_start;
+    unsigned long end = (unsigned long)zonefseg_end;
+    unsigned long pos;
+
+    for (pos = ALIGN(start, 0x10); pos <= ALIGN_DOWN(end, 0x10); pos += 0x10)
+        if (get_acpi_rsdp_length((void *)pos, end - pos) >= 0)
+            return (void *)pos;
+
+    return NULL;
+}

src/util.h

diff --git a/src/util.h b/src/util.h
index c9d463d..e6a6cb5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -73,6 +73,7 @@
 // fw/biostable.c
 void copy_smbios(void *pos);
 void copy_table(void *pos);
+void *find_acpi_rsdp(void);
 
 // fw/coreboot.c
 extern const char *CBvendor, *CBpart;