Commit 32ec7fd0 authored by H. Peter Anvin's avatar H. Peter Anvin

x86, setup: preemptively save/restore edi and ebp around INT 15 E820

Impact: BIOS bugproofing

Since there are BIOSes known to clobber %ebx and %esi for INT 15 E820,
assume there is something out there clobbering %edi and/or %ebp too,
and don't wait for it to fail.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 01522df3
...@@ -20,7 +20,7 @@ static int detect_memory_e820(void) ...@@ -20,7 +20,7 @@ static int detect_memory_e820(void)
{ {
int count = 0; int count = 0;
u32 next = 0; u32 next = 0;
u32 size, id; u32 size, id, edi;
u8 err; u8 err;
struct e820entry *desc = boot_params.e820_map; struct e820entry *desc = boot_params.e820_map;
...@@ -29,10 +29,11 @@ static int detect_memory_e820(void) ...@@ -29,10 +29,11 @@ static int detect_memory_e820(void)
/* Important: %edx and %esi are clobbered by some BIOSes, /* Important: %edx and %esi are clobbered by some BIOSes,
so they must be either used for the error output so they must be either used for the error output
or explicitly marked clobbered. */ or explicitly marked clobbered. Given that, assume there
asm("int $0x15; setc %0" is something out there clobbering %ebp and %edi, too. */
asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
: "=d" (err), "+b" (next), "=a" (id), "+c" (size), : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
"=m" (*desc) "=D" (edi), "=m" (*desc)
: "D" (desc), "d" (SMAP), "a" (0xe820) : "D" (desc), "d" (SMAP), "a" (0xe820)
: "esi"); : "esi");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment