bios: Make sure PVH still works with "rom" feature

josephlr · josephlr · commit 99abf1de8a44 · 2020-04-09T01:53:29.000-07:00
Without this change, QEMU/CloudHV will attempt to load the ROM into the
memory region below 4GiB. But something (i.e. SeaBIOS) is already there.

We just pick an arbitrary address. It doesn't actually matter where it
gets loaded, as the ROM code isn't used when doing PVH boot.
diff --git a/layout.ld b/layout.ld
@@ -4,7 +4,9 @@ PHDRS
 {
   ram  PT_LOAD FILEHDR PHDRS ;
   note PT_NOTE               ;
-  rom  PT_LOAD               ;
+  /* We set the PhysAddr to an arbitrary RAM address, so that the ROM will still
+     boot with PVH. Without this, this PHDR conflicts with QEMU's SeaBIOS.    */
+  rom  PT_LOAD AT(ram_max)   ;
 }
 
 /* Loaders like to put stuff in low memory (< 1M), so we don't use it. */

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ PHDRS`
`4`	`4`	`{`
`5`	`5`	`ram PT_LOAD FILEHDR PHDRS ;`
`6`	`6`	`note PT_NOTE ;`
`7`		`- rom PT_LOAD ;`
	`7`	`+ /* We set the PhysAddr to an arbitrary RAM address, so that the ROM will still`
	`8`	`+ boot with PVH. Without this, this PHDR conflicts with QEMU's SeaBIOS. */`
	`9`	`+ rom PT_LOAD AT(ram_max) ;`
`8`	`10`	`}`
`9`	`11`
`10`	`12`	`/* Loaders like to put stuff in low memory (< 1M), so we don't use it. */`