Skip to contentSkip to conversation

optionrom/pvh: scan entire RSDP Area

PATCH Applied Joe Richey 3 participants 3 messages Mar 3, 2020 – Mar 4, 2020

lore
Share & tools
lore

Joe Richey

author
#0 lore raw

PATCH 1/1 optionrom/pvh: scan entire RSDP Area

From: Joe Richey <[email protected]>

Right now the PVH option rom scans for the RSDP from 0xE0000 to 0xE1FFF. This is probobly a typo, it should scan from 0xE0000 to 0xFFFFF.

This is actually an issue on some QEMU versions/machines. For example, when I run QEMU the RSDP is placed at 0xf5ad0 which will not be picked up by the current implementation.

This bug still allows a Linux guest to boot (in most configurations) as the kernel will just scan for the RSDP if one isn't provided.

---
 pc-bios/optionrom/pvh_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
pc-bios/optionrom/pvh_main.c +1 -1
index a015e1bf22..28e79d7fc4 100644
@@ -29,7 +29,7 @@ asm (".code32"); /* this code will be executed in protected mode */
 
 #define RSDP_SIGNATURE          0x2052545020445352LL /* "RSD PTR " */
 #define RSDP_AREA_ADDR          0x000E0000
-#define RSDP_AREA_SIZE          2048
+#define RSDP_AREA_SIZE          0x00020000
 #define EBDA_BASE_ADDR          0x0000040E
 #define EBDA_SIZE               1024
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

CCing Paolo

Quoted 23 lines · Joe Richey

From: Joe Richey <[email protected]>

Right now the PVH option rom scans for the RSDP from 0xE0000 to 0xE1FFF. This is probobly a typo, it should scan from 0xE0000 to 0xFFFFF.

This is actually an issue on some QEMU versions/machines. For example, when I run QEMU the RSDP is placed at 0xf5ad0 which will not be picked up by the current implementation.

This bug still allows a Linux guest to boot (in most configurations) as the kernel will just scan for the RSDP if one isn't provided.

---
 pc-bios/optionrom/pvh_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
pc-bios/optionrom/pvh_main.c +0 -0
index a015e1bf22..28e79d7fc4 100644

pc-bios/optionrom/pvh_main.c asm (".code32"); /* this code will be executed in protected mode */ · line 35

Quoted 8 lines
pc-bios/optionrom/pvh_main.c +1 -1
@@ -29,7 +29,7 @@ asm (".code32"); /* this code will be executed in protected mode */
 
 #define RSDP_SIGNATURE          0x2052545020445352LL /* "RSD PTR " */
 #define RSDP_AREA_ADDR          0x000E0000
-#define RSDP_AREA_SIZE          2048
+#define RSDP_AREA_SIZE          0x00020000
 #define EBDA_BASE_ADDR          0x0000040E
 #define EBDA_SIZE               1024
 

The patch LGTM!

When I wrote this code I followed [1], where it is written that it can be found in the "memory region from 0x000E0000 to 0x000FFFFF", so it should be a typo.

Thanks for fixing it!

Fixes 2785dc7b17 ("optionrom: add new PVH option rom")

[1] https://wiki.osdev.org/RSDP#Detecting_the_RSDP

#2 lore raw
Quoted 41 lines · Stefano Garzarella

CCing Paolo

Quoted 23 lines · Joe Richey

From: Joe Richey <[email protected]>

Right now the PVH option rom scans for the RSDP from 0xE0000 to 0xE1FFF. This is probobly a typo, it should scan from 0xE0000 to 0xFFFFF.

This is actually an issue on some QEMU versions/machines. For example, when I run QEMU the RSDP is placed at 0xf5ad0 which will not be picked up by the current implementation.

This bug still allows a Linux guest to boot (in most configurations) as the kernel will just scan for the RSDP if one isn't provided.

---
 pc-bios/optionrom/pvh_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
pc-bios/optionrom/pvh_main.c +0 -0
index a015e1bf22..28e79d7fc4 100644

pc-bios/optionrom/pvh_main.c asm (".code32"); /* this code will be executed in protected mode */ · line 35

Quoted 8 lines
pc-bios/optionrom/pvh_main.c +1 -1
@@ -29,7 +29,7 @@ asm (".code32"); /* this code will be executed in protected mode */
 
 #define RSDP_SIGNATURE          0x2052545020445352LL /* "RSD PTR " */
 #define RSDP_AREA_ADDR          0x000E0000
-#define RSDP_AREA_SIZE          2048
+#define RSDP_AREA_SIZE          0x00020000
 #define EBDA_BASE_ADDR          0x0000040E
 #define EBDA_SIZE               1024
 

The patch LGTM!

When I wrote this code I followed [1], where it is written that it can be found in the "memory region from 0x000E0000 to 0x000FFFFF", so it should be a typo.

Quoted 9 lines

Thanks for fixing it!

Fixes 2785dc7b17 ("optionrom: add new PVH option rom")

[1] https://wiki.osdev.org/RSDP#Detecting_the_RSDP

Queued, thanks for both the fix and the Cc.

Paolo