Author: blueswirl
Date: 2009-12-29 18:36:03 +0100 (Tue, 29 Dec 2009)
New Revision: 650
Modified:
trunk/openbios-devel/arch/sparc64/entry.S
trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
Log:
Postpone mapping of the memory
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified: trunk/openbios-devel/arch/sparc64/entry.S
===================================================================
--- trunk/openbios-devel/arch/sparc64/entry.S 2009-12-28 10:24:32 UTC (rev 649)
+++ trunk/openbios-devel/arch/sparc64/entry.S 2009-12-29 17:36:03 UTC (rev 650)
@@ -180,26 +180,6 @@
bne 1b
add %l2, %g5, %l2
-#if 1
- ! setup 0-16M
- mov %g0, %g4
- mov 4, %g6
- set 48, %g7
- set 0x400000, %g5
-1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0, ctx=0
- set 0xe0000000, %g3
- sllx %g3, 32, %g3
- or %g3, 0x36, %g3
- or %g4, %g3, %g3
- ! valid, 4M, cacheable(I/E/C), priv, writable
- ! paddr = 0
- stxa %g3, [%g0] ASI_DTLB_DATA_IN
- add %g4, %g5, %g4
- deccc %g6
- bne 1b
- nop
-#endif
-
membar #Sync
setx _start, %g7, %g4
@@ -224,25 +204,6 @@
bne 1b
add %l2, %g5, %l2
-#if 1
- ! setup 0-16M
- mov %g0, %g4
- mov 4, %g6
- set 0x400000, %g5
-1: stxa %g4, [%g7] ASI_IMMU ! vaddr = 0, ctx=0
- set 0xe0000000, %g3
- sllx %g3, 32, %g3
- or %g3, 0x34, %g3
- or %g4, %g3, %g3
- ! valid, 4M, cacheable(I/E/C), priv
- ! paddr = 0
- stxa %g3, [%g0] ASI_ITLB_DATA_IN
- add %g4, %g5, %g4
- deccc %g6
- bne 1b
- nop
-#endif
-
flush %g4
mov %g1, %g3
Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
===================================================================
--- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-28 10:24:32 UTC (rev 649)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-29 17:36:03 UTC (rev 650)
@@ -100,5 +100,8 @@
/* inherit translations set up by entry.S */
ofmem_walk_boot_map(remap_page_range);
+
+ /* Map the memory */
+ ofmem_map_page_range(0, 0, qemu_mem_size, 0x36);
}