[PATCH RFC v2 4/4] hvmloader/ovmf: setup E820 map

[Wei Liu <wei.liu2@citrix.com>]

E820 map will be used by OVMF to create memory map.

Modify build_e820_table to cope with the fact that OVMF doesn't actually
need to reserve bios_image_base - 0x100000.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/firmware/hvmloader/e820.c |   20 +++++++++++---------
 tools/firmware/hvmloader/ovmf.c |   12 +++++++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index 2e05e93..bdb66f5 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -81,8 +81,6 @@ int build_e820_table(struct e820entry *e820,
     /* Lowmem must be at least 512K to keep Windows happy) */
     ASSERT ( lowmem_reserved_base > 512<<10 );
 
-    ASSERT ( bios_image_base < 0x100000 );
-
     /*
      * 0x0-lowmem_reserved_base: Ordinary RAM.
      */
@@ -109,13 +107,17 @@ int build_e820_table(struct e820entry *e820,
      * TODO: free pages which turn out to be unused.
      */
 
-    /*
-     * BIOS region.
-     */
-    e820[nr].addr = bios_image_base;
-    e820[nr].size = 0x100000-bios_image_base;
-    e820[nr].type = E820_RESERVED;
-    nr++;
+   /*
+    * BIOS region if we have one.
+    */
+    if ( bios_image_base != (unsigned int)-1 )
+    {
+        ASSERT ( bios_image_base < 0x100000 );
+        e820[nr].addr = bios_image_base;
+        e820[nr].size = 0x100000-bios_image_base;
+        e820[nr].type = E820_RESERVED;
+        nr++;
+    }
 
     /* Low RAM goes here. Reserve space for special pages. */
     BUG_ON((hvm_info->low_mem_pgend << PAGE_SHIFT) < (2u << 20));
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index 1564263..e17f4e1 100644
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -138,6 +138,16 @@ static void ovmf_create_smbios_tables(void)
         SMBIOS_PHYSICAL_END);
 }
 
+static void ovmf_setup_e820(void)
+{
+    struct ovmf_info *info = (void *)OVMF_INFO_PHYSICAL_ADDRESS;
+    struct e820entry *e820 = scratch_alloc(sizeof(struct e820entry)*128, 0);
+    info->e820 = (uint32_t)e820;
+
+    info->e820_nr = build_e820_table(e820, 0, (unsigned int)-1);
+    dump_e820_table(e820, info->e820_nr);
+}
+
 struct bios_config ovmf_config =  {
     .name = "OVMF",
 
@@ -152,7 +162,7 @@ struct bios_config ovmf_config =  {
     .bios_info_setup = ovmf_setup_bios_info,
     .bios_info_finish = ovmf_finish_bios_info,
 
-    .e820_setup = NULL,
+    .e820_setup = ovmf_setup_e820,
 
     .acpi_build_tables = ovmf_acpi_build_tables,
     .create_mp_tables = NULL,
-- 
1.7.10.4