d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make mpentry independent of _start

Browse Source 
APs enter the kernel at the same point as the BSP, the _start routine.
They then jump to mpentry, but not before storing the kernel's physical
load address in the s9 register. Extract this calculation into its own
routine, so that APs can be instructed to enter directly from mpentry.

Differential Revision:	https://reviews.freebsd.org/D24495
This commit is contained in:
Mitchell Horne 2020-05-01 21:52:29 +00:00
parent d5cc572ce6
commit df62bf00a5
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/riscv/riscv/locore.S
View File

@ -59,13 +59,6 @@ _start:
lla gp, __global_pointer$
.option pop
/* Get the physical address kernel loaded to */
lla t0, virt_map
ld t1, 0(t0)
sub t1, t1, t0
li t2, KERNBASE
sub s9, t2, t1 /* s9 = physmem base */
/*
* a0 = hart id
* a1 = dtbp
@ -87,6 +80,9 @@ _start:
* Page tables
*/
1:
/* Get the kernel's load address */
jal get_physmem
/* Add L1 entry for kernel */
lla s1, pagetable_l1
lla s2, pagetable_l2 /* Link to next level PN */
@ -224,6 +220,17 @@ va:
call _C_LABEL(initriscv) /* Off we go */
call _C_LABEL(mi_startup)
/*
* Get the physical address the kernel is loaded to. Returned in s9.
*/
get_physmem:
lla t0, virt_map /* physical address of virt_map */
ld t1, 0(t0) /* virtual address of virt_map */
sub t1, t1, t0 /* calculate phys->virt delta */
li t2, KERNBASE
sub s9, t2, t1 /* s9 = physmem base */
ret
.align 4
initstack:
.space (PAGE_SIZE * KSTACK_PAGES)
@ -303,6 +310,9 @@ ENTRY(mpentry)
lla t0, bootstack
ld sp, 0(t0)
/* Get the kernel's load address */
jal get_physmem
/* Setup supervisor trap vector */
lla t0, mpva
sub t0, t0, s9