From ad22f753e17425adb713cae10bb39f06dfd6b4d1 Mon Sep 17 00:00:00 2001
From: mcayland <mcayland@f158a5a8-5612-0410-a976-696ce0be7e32>
Date: Tue, 8 Feb 2011 22:06:54 +0000
Subject: [PATCH] Fix up /virtual-memory reg property on SPARC32.

Make it similar to the OBP output with 2 entries consisting of half the virtual address space.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>

git-svn-id: svn://openbios.org/openbios/trunk/openbios-devel@1022 f158a5a8-5612-0410-a976-696ce0be7e32
---
 arch/sparc32/lib.c | 30 +++++++++++++++++++++++++-----
 drivers/iommu.c    | 14 --------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/arch/sparc32/lib.c b/arch/sparc32/lib.c
index 90a070b..5b41dff 100644
--- a/arch/sparc32/lib.c
+++ b/arch/sparc32/lib.c
@@ -373,7 +373,10 @@ void obp_dumb_memfree(__attribute__((unused))char *va,
 void
 ob_init_mmu(void)
 {
-    ucell *reg;
+    ucell *memreg;
+    ucell *virtreg;
+    phys_addr_t virtregsize;
+    ofmem_t *ofmem = ofmem_arch_get_private();
 
     init_romvec_mem();
 
@@ -391,18 +394,35 @@ ob_init_mmu(void)
     ofmem_register(s_phandle_memory, s_phandle_mmu);
 
     /* Setup /memory:reg (totphys) property */
-    reg = malloc(3 * sizeof(ucell));
-    ofmem_arch_encode_physaddr(reg, 0); /* physical base */
-    reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */
+    memreg = malloc(3 * sizeof(ucell));
+    ofmem_arch_encode_physaddr(memreg, 0); /* physical base */
+    memreg[2] = (ucell)ofmem->ramsize; /* size */
 
     push_str("/memory");
     fword("find-device");
-    PUSH(pointer2cell(reg));
+    PUSH(pointer2cell(memreg));
     PUSH(3 * sizeof(ucell));
     push_str("reg");
     PUSH_ph(s_phandle_memory);
     fword("encode-property");
 
+    /* Setup /virtual-memory:reg property */
+    virtregsize = ((phys_addr_t)((ucell)-1) + 1) / 2;
+    
+    virtreg = malloc(6 * sizeof(ucell));
+    ofmem_arch_encode_physaddr(virtreg, 0);
+    virtreg[2] = virtregsize;
+    ofmem_arch_encode_physaddr(&virtreg[3], virtregsize);
+    virtreg[5] = virtregsize;
+    
+    push_str("/virtual-memory");
+    fword("find-device");
+    PUSH(pointer2cell(virtreg));
+    PUSH(6 * sizeof(ucell));
+    push_str("reg");
+    PUSH_ph(s_phandle_mmu);
+    fword("encode-property");
+    
     PUSH(0);
     fword("active-package!");
     bind_func("pgmap@", pgmap_fetch);
diff --git a/drivers/iommu.c b/drivers/iommu.c
index 28f3b57..5eb8a60 100644
--- a/drivers/iommu.c
+++ b/drivers/iommu.c
@@ -155,20 +155,6 @@ ob_init_iommu(uint64_t base)
 
     regs = iommu_init(&ciommu, base);
 
-    push_str("/virtual-memory");
-    fword("find-device");
-
-    PUSH(base >> 32);
-    fword("encode-int");
-    PUSH(base & 0xffffffff);
-    fword("encode-int");
-    fword("encode+");
-    PUSH(IOMMU_REGS);
-    fword("encode-int");
-    fword("encode+");
-    push_str("reg");
-    fword("property");
-
     push_str("/iommu");
     fword("find-device");
     PUSH((unsigned long)regs);
-- 
2.11.4.GIT