x86: Fix how the location of the realmode and bios blobs are calculated

There are two blobs embedded into the u-boot image which are linked to run
at an address which is different from where they actually end up in the
ROM, one called "realmode" and one called "bios". There are realmode_setup
and bios_setup functions which prepare those blobs by copying them into the
location they're supposed to run from, among other things.

During u-boot relocation from ROM to RAM, the text and a few data segments
are copied over. The realmode and bios sections are not copied, and so the
only place they can be read from is their original location in the ROM.
Looking specifically at the bios blob, there are symbols defined in the
linker script called __bios_start and __bios_size which are defined to be
the start and size of the blob in the ROM.

In the bios_setup function, there seem to be two mistakes happening. First,
the offset from ROM to RAM is being added to __bios_start which implies that
this code expects to use the copy moved to RAM. No such copy is made, so
that's wrong. More subtly, when u-boot relocates itself, it goes through
all of the relocations stored in .rel.dyn and fixes them up. This has the
effect of transforming the __bios_start reference in bios_setup so that it
refers to the version in RAM (if one existed) instead of the one in ROM. To
correct for that, the offset actually needs to be subtracted out again to
translate the address back into the ROM.

The net effect is that for both blobs, a + needs to be changed to a -.

Signed-off-by: Gabe Black <gabeblack@chromium.org>

diff --git a/arch/x86/lib/bios_setup.c b/arch/x86/lib/bios_setup.c
index 053280b955b8fbdbeb3c878f3708e7ee949197dc..0dfe4a103187bd54aee9e37dc24bdbefa5af5408 100644 (file)
--- a/arch/x86/lib/bios_setup.c
+++ b/arch/x86/lib/bios_setup.c
@@ -78,7 +78,11 @@ static void setvector(int vector, u16 segment, void *handler)
 
 int bios_setup(void)
 {
-       ulong bios_start = (ulong)&__bios_start + gd->reloc_off;
+       /*
+        * The BIOS section is not relocated and still in the ROM. The
+        * __bios_start symbol was adjusted, though, so adjust it back.
+        */
+       ulong bios_start = (ulong)&__bios_start - gd->reloc_off;
        ulong bios_size = (ulong)&__bios_size;
 
        static int done;

diff --git a/arch/x86/lib/realmode.c b/arch/x86/lib/realmode.c
index 5a525ee79e1b3dff0f8e9d46897b7b0f5b3ceebd..bf0d0aaa31e16bf42a5278cdde82fd6c0c8a4f6d 100644 (file)
--- a/arch/x86/lib/realmode.c
+++ b/arch/x86/lib/realmode.c
@@ -30,7 +30,11 @@
 
 int realmode_setup(void)
 {
-       ulong realmode_start = (ulong)&__realmode_start + gd->reloc_off;
+       /*
+        * The realmode section is not relocated and still in the ROM. The
+        * __realmode_start symbol was adjusted, though, so adjust it back.
+        */
+       ulong realmode_start = (ulong)&__realmode_start - gd->reloc_off;
        ulong realmode_size = (ulong)&__realmode_size;
 
        /* copy the realmode switch code */