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

Clean up early arm64 pmap code

Browse Source 
Early in the arm64 pmap code we need to translate between a virtual
address and a physical address. Rather than manually walking the page
table we can ask the hardware to do it for us.

Reviewed by:	kib, markj
Sponsored by:	Innovate UK
Differential Revision: https://reviews.freebsd.org/D30357
This commit is contained in:
Andrew Turner 2021-05-20 06:52:15 +00:00
parent ac02945f7e
commit e779604f1d
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm64/arm64/locore.S
View File

@ -735,10 +735,6 @@ ENTRY(abort)
b abort b abort
END(abort) END(abort)
.align 3
init_pt_va:
.quad pagetable /* XXX: Keep page tables VA */
.section .init_pagetable, "aw", %nobits .section .init_pagetable, "aw", %nobits
.align PAGE_SHIFT .align PAGE_SHIFT
/* /*
@ -773,8 +769,6 @@ pagetable_end:
el2_pagetable: el2_pagetable:
.space PAGE_SIZE .space PAGE_SIZE
.globl init_pt_va
.align 4 .align 4
initstack: initstack:
.space (PAGE_SIZE * KSTACK_PAGES) .space (PAGE_SIZE * KSTACK_PAGES)

28
sys/arm64/arm64/pmap.c
View File

@ -742,35 +742,13 @@ pmap_resident_count_dec(pmap_t pmap, int count)
pmap->pm_stats.resident_count -= count; pmap->pm_stats.resident_count -= count;
} }
static pt_entry_t *
pmap_early_page_idx(vm_offset_t l1pt, vm_offset_t va, u_int *l1_slot,
u_int *l2_slot)
{
pt_entry_t *l2;
pd_entry_t *l1;
l1 = (pd_entry_t *)l1pt;
*l1_slot = (va >> L1_SHIFT) & Ln_ADDR_MASK;
/* Check locore has used a table L1 map */
KASSERT((l1[*l1_slot] & ATTR_DESCR_MASK) == L1_TABLE,
("Invalid bootstrap L1 table"));
/* Find the address of the L2 table */
l2 = (pt_entry_t *)init_pt_va;
*l2_slot = pmap_l2_index(va);
return (l2);
}
static vm_paddr_t static vm_paddr_t
pmap_early_vtophys(vm_offset_t l1pt, vm_offset_t va) pmap_early_vtophys(vm_offset_t l1pt, vm_offset_t va)
{ {
u_int l1_slot, l2_slot; vm_paddr_t pa_page;
pt_entry_t *l2;
l2 = pmap_early_page_idx(l1pt, va, &l1_slot, &l2_slot); pa_page = arm64_address_translate_s1e1r(va) & PAR_PA_MASK;
return (pa_page | (va & PAR_LOW_MASK));
return ((l2[l2_slot] & ~ATTR_MASK) + (va & L2_OFFSET));
} }
static vm_offset_t static vm_offset_t

1
sys/arm64/include/vmparam.h
View File

@ -228,7 +228,6 @@ extern vm_paddr_t dmap_phys_base;
extern vm_paddr_t dmap_phys_max; extern vm_paddr_t dmap_phys_max;
extern vm_offset_t dmap_max_addr; extern vm_offset_t dmap_max_addr;
extern vm_offset_t vm_max_kernel_address; extern vm_offset_t vm_max_kernel_address;
extern vm_offset_t init_pt_va;
#endif #endif