[Xen-changelog] [xen-unstable] tools: hvmloader: split scratch and hypercall addressing from ROMBIOS low heap.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302611962 -3600
# Node ID a09d5a85609e01fee0a3618349af86dbf91bdb90
# Parent  ca43f04eaa8e4096909004e0631c4f122ec2d215
tools: hvmloader: split scratch and hypercall addressing from ROMBIOS low heap.

Although happen to live at the same physical address their lifespans
do not overlap. The scratch and hypercall spaces are used only within
hvmloader and the same area is reused as a heap within ROMBIOS. But
each is free to make its own decisions about where to place things.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r ca43f04eaa8e -r a09d5a85609e tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Tue Apr 12 13:38:38 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Tue Apr 12 13:39:22 2011 +0100
@@ -33,6 +33,9 @@
 #include "e820.h"
 #include "../rombios/config.h"
 
+#define SCRATCH_PHYSICAL_ADDRESS      0x00010000
+#define HYPERCALL_PHYSICAL_ADDRESS    0x00080000
+
 #define VGABIOS_PHYSICAL_ADDRESS      0x000C0000
 
 #endif /* __HVMLOADER_CONFIG_H__ */
diff -r ca43f04eaa8e -r a09d5a85609e tools/firmware/rombios/32bit/pmm.c
--- a/tools/firmware/rombios/32bit/pmm.c        Tue Apr 12 13:38:38 2011 +0100
+++ b/tools/firmware/rombios/32bit/pmm.c        Tue Apr 12 13:39:22 2011 +0100
@@ -147,7 +147,7 @@
  *
  * - conventional memroy (below 1MB)
  *    In HVM, the area is fixed. 0x00010000-0x0007FFFF
- *    (from SCRATCH_PHYSICAL_ADDRESS to HYPERCALL_PHYSICAL_ADDRESS)
+ *    (LOWHEAP_SIZE bytes from LOWHEAP_PHYSICAL_ADDRESS)
  *
  * - extended memory (start at 1MB, below 4GB)
  *    In HVM, the area starts at memory address 0x00100000.
@@ -283,8 +283,9 @@
     }
 
     /* convectional memory: RAM below 1MB, 0x10000-0x7FFFF */
-    pmm_init_heap(&pmm_data.heap, SCRATCH_PHYSICAL_ADDRESS,
-                  HYPERCALL_PHYSICAL_ADDRESS);
+    pmm_init_heap(&pmm_data.heap,
+                 LOWHEAP_PHYSICAL_ADDRESS,
+                 LOWHEAP_PHYSICAL_ADDRESS+LOWHEAP_SIZE);
 }
 
 static uint32_t
diff -r ca43f04eaa8e -r a09d5a85609e tools/firmware/rombios/config.h
--- a/tools/firmware/rombios/config.h   Tue Apr 12 13:38:38 2011 +0100
+++ b/tools/firmware/rombios/config.h   Tue Apr 12 13:39:22 2011 +0100
@@ -2,8 +2,8 @@
 #define _ROMBIOS_CONFIG_H
 
 /* Memory map. */
-#define SCRATCH_PHYSICAL_ADDRESS      0x00010000
-#define HYPERCALL_PHYSICAL_ADDRESS    0x00080000
+#define LOWHEAP_PHYSICAL_ADDRESS      0x00010000
+#define LOWHEAP_SIZE                  0x00070000
 
 #define OPTIONROM_PHYSICAL_ADDRESS    0x000C8000
 #define OPTIONROM_PHYSICAL_END        0x000EA000

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog