[commit] r1055 - trunk/openbios-devel/arch/sparc64

[repository service]

Author: mcayland
Date: Sat Apr 28 15:35:03 2012
New Revision: 1055
URL: http://tracker.coreboot.org/trac/openbios/changeset/1055

Log:
SPARC64: Swap Forth machine memory allocation over to OFMEM memory pool.

Instead of using our internal memory pool to run the Forth machine,
allocate the memory using OFMEM. This enables us to dramatically increase
the memory available to Forth clients whilst substantially reducing the
memory requirement for the resulting image.

Signed-off-by: Mark Cave-Ayland <[e-mail]>

Modified:
   trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
   trunk/openbios-devel/arch/sparc64/openbios.c

Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c	Sat Apr 28 15:35:00 2012	(r1054)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c	Sat Apr 28 15:35:03 2012	(r1055)
@@ -20,7 +20,7 @@
 
 #define OF_MALLOC_BASE		((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8))
 
-#define MEMSIZE ((256 + 512) * 1024)
+#define MEMSIZE (128 * 1024)
 static union {
 	char memory[MEMSIZE];
 	ofmem_t ofmem;

Modified: trunk/openbios-devel/arch/sparc64/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/openbios.c	Sat Apr 28 15:35:00 2012	(r1054)
+++ trunk/openbios-devel/arch/sparc64/openbios.c	Sat Apr 28 15:35:03 2012	(r1055)
@@ -21,7 +21,8 @@
 #include "../../drivers/timer.h" // XXX
 #define NO_QEMU_PROTOS
 #include "arch/common/fw_cfg.h"
-#include "libopenbios/ofmem.h"
+#include "arch/sparc64/ofmem_sparc64.h"
+#include "spitfire.h"
 
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
 
@@ -34,8 +35,6 @@
 
 #define MEMORY_SIZE     (512*1024)      /* 512K ram for hosted system */
 
-static ucell *memory;
-
 // XXX
 #define NVRAM_SIZE       0x2000
 #define NVRAM_IDPROM     0x1fd8
@@ -553,17 +552,28 @@
 
 static void init_memory(void)
 {
-    memory = malloc(MEMORY_SIZE);
-    if (!memory)
-        printk("panic: not enough memory on host system.\n");
+    phys_addr_t phys;
+    ucell virt;
+    
+    /* Claim the memory from OFMEM (align to 512K so we only take 1 TLB slot) */
+    phys = ofmem_claim_phys(-1, MEMORY_SIZE, PAGE_SIZE_512K);
+    if (!phys)
+        printk("panic: not enough physical memory on host system.\n");
+    
+    virt = ofmem_claim_virt(-1, MEMORY_SIZE, PAGE_SIZE_512K);
+    if (!virt)
+        printk("panic: not enough virtual memory on host system.\n");
+
+    /* Generate the mapping (and lock translation into the TLBs) */
+    ofmem_map(phys, virt, MEMORY_SIZE, ofmem_arch_default_translation_mode(phys) | SPITFIRE_TTE_LOCKED);
 
     /* we push start and end of memory to the stack
      * so that it can be used by the forth word QUIT
      * to initialize the memory allocator
      */
-
-    PUSH((ucell)memory);
-    PUSH((ucell)memory + (ucell)MEMORY_SIZE);
+    
+    PUSH(virt);
+    PUSH(virt + MEMORY_SIZE);
 }
 
 static void