sparcv8leon3: allocate space for copied syspage

JIRA: RTOS-907

Author: lukileczo

hal/sparcv8leon3/gaisler/generic/_init.S

@@ -30,7 +30,7 @@
 #define ADDR_PDIR2     (ADDR_PDIR1 + 0x400)
 #define ADDR_PDIR3     (ADDR_CTXTAB + 0x1000)
 
-#define VADDR_SYSPAGE     (_end + SIZE_PAGE - 1)
+#define VADDR_SYSPAGE     _hal_syspageCopied
 #define PADDR_SYSPAGE     PHY_ADDR(VADDR_SYSPAGE)
 
 #define VADDR_STACK (pmap_common + 7 * SIZE_PAGE)
@@ -47,13 +47,6 @@
 .endm
 
 
-.macro set_page_align addr out
-	sethi %hi(\addr), \out
-	srl \out, 12, \out
-	sll \out, 12, \out
-.endm
-
-
 .section ".text"
 .align   4
 .global  _init
@@ -74,7 +67,7 @@ _init:
 
 	/* %g2 = syspage pa (from plo) */
 	set PHY_ADDR(syspage), %g3
-	set_page_align VADDR_SYSPAGE, %g1
+	set VADDR_SYSPAGE, %g1
 
 	/* store VADDR_SYSPAGE in syspage */
 	st %g1, [%g3]
@@ -84,7 +77,7 @@ _init:
 	sub %g1, %g2, %l0
 	st %l0, [%g4]
 
-	set_page_align PADDR_SYSPAGE, %g3
+	set PADDR_SYSPAGE, %g3
 	/* calculate pa of syspage end */
 	ld [%g2 + 4], %l1 /* %l1 = syspage->size */
 	add %g2, %l1, %l2 /* %l2 = plo syspage end */
@@ -274,3 +267,10 @@ _init_core_loop:
 	ba _init_core_loop
 	nop
 .size _init_core, . - _init_core
+
+
+.section ".bss"
+.align 4
+_hal_syspageCopied:
+	.zero 0x400
+.size _hal_syspageCopied, . - _hal_syspageCopied

hal/sparcv8leon3/gaisler/gr712rc/_init.S

@@ -30,7 +30,7 @@
 #define ADDR_PDIR2     (ADDR_PDIR1 + 0x400)
 #define ADDR_PDIR3     (ADDR_CTXTAB + 0x1000)
 
-#define VADDR_SYSPAGE     (_end + SIZE_PAGE - 1)
+#define VADDR_SYSPAGE     _hal_syspageCopied
 #define PADDR_SYSPAGE     PHY_ADDR(VADDR_SYSPAGE)
 
 #define VADDR_STACK (pmap_common + 7 * SIZE_PAGE)
@@ -47,13 +47,6 @@
 .endm
 
 
-.macro set_page_align addr out
-	sethi %hi(\addr), \out
-	srl \out, 12, \out
-	sll \out, 12, \out
-.endm
-
-
 .section ".text"
 .align   4
 .global  _init
@@ -74,7 +67,7 @@ _init:
 
 	/* %g2 = syspage pa (from plo) */
 	set PHY_ADDR(syspage), %g3
-	set_page_align VADDR_SYSPAGE, %g1
+	set VADDR_SYSPAGE, %g1
 
 	/* store VADDR_SYSPAGE in syspage */
 	st %g1, [%g3]
@@ -84,7 +77,7 @@ _init:
 	sub %g1, %g2, %l0
 	st %l0, [%g4]
 
-	set_page_align PADDR_SYSPAGE, %g3
+	set PADDR_SYSPAGE, %g3
 	/* calculate pa of syspage end */
 	ld [%g2 + 4], %l1 /* %l1 = syspage->size */
 	add %g2, %l1, %l2 /* %l2 = plo syspage end */
@@ -277,3 +270,10 @@ _init_core_loop:
 	ba _init_core_loop
 	nop
 .size _init_core, . - _init_core
+
+
+.section ".bss"
+.align 4
+_hal_syspageCopied:
+	.zero 0x400
+.size _hal_syspageCopied, . - _hal_syspageCopied

hal/sparcv8leon3/pmap.c

@@ -725,13 +725,13 @@ void _pmap_init(pmap_t *pmap, void **vstart, void **vend)
 	_pmap_enter(pmap, (addr_t)pmap_common.start, (*vstart), PGHD_WRITE | PGHD_READ | PGHD_PRESENT, NULL, 0);
 
 	/* Map kernel text & rodata as RX */
-	for (i = VADDR_KERNEL; i < CEIL_PAGE((ptr_t)(&__bss_start)); i += SIZE_PAGE) {
+	for (i = VADDR_KERNEL; i < CEIL_PAGE((ptr_t)(&_etext)); i += SIZE_PAGE) {
 		addr = pmap_common.kernel + (i - VADDR_KERNEL);
 		_pmap_enter(pmap, addr, (void *)i, PGHD_READ | PGHD_EXEC | PGHD_PRESENT, NULL, 0);
 	}
 
-	/* Map kernel bss and copied syspage as RW */
-	for (i = CEIL_PAGE((ptr_t)(&__bss_start)); i < CEIL_PAGE((ptr_t)(&_end)) + SIZE_PAGE; i += SIZE_PAGE) {
+	/* Map kernel bss as RW */
+	for (i = CEIL_PAGE((ptr_t)(&__bss_start)); i < CEIL_PAGE((ptr_t)(&_end)); i += SIZE_PAGE) {
 		addr = pmap_common.kernel + (i - VADDR_KERNEL);
 		_pmap_enter(pmap, addr, (void *)i, PGHD_WRITE | PGHD_READ | PGHD_PRESENT, NULL, 0);
 	}
@@ -755,6 +755,6 @@ void _pmap_halInit(void)
 	pmap_common.memMap.count = 0;
 
 	pmap_common.kernel = syspage->pkernel;
-	pmap_common.kernelsz = CEIL_PAGE(&_end) - (addr_t)&_start + SIZE_PAGE;
-	pmap_common.vkernelEnd = VADDR_KERNEL + pmap_common.kernelsz;
+	pmap_common.kernelsz = CEIL_PAGE(&_end) - VADDR_KERNEL;
+	pmap_common.vkernelEnd = CEIL_PAGE(&_end);
 }