Author: andrew
Date: Sun Jul 31 17:53:09 2016
New Revision: 303592
URL: https://svnweb.freebsd.org/changeset/base/303592
Log:
Extract the common parts of pmap_kenter_device to a new function. This will
be used when superpage support is added.
Obtained from: ABT Systems Ltd
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/arm64/pmap.c
Modified: head/sys/arm64/arm64/pmap.c
==============================================================================
--- head/sys/arm64/arm64/pmap.c Sun Jul 31 15:15:27 2016 (r303591)
+++ head/sys/arm64/arm64/pmap.c Sun Jul 31 17:53:09 2016 (r303592)
@@ -1037,8 +1037,8 @@ pmap_kextract(vm_offset_t va)
* Low level mapping routines.....
***************************************************/
-void
-pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa)
+static void
+pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode)
{
pd_entry_t *pde;
pt_entry_t *pte;
@@ -1046,23 +1046,22 @@ pmap_kenter_device(vm_offset_t sva, vm_s
int lvl;
KASSERT((pa & L3_OFFSET) == 0,
- ("pmap_kenter_device: Invalid physical address"));
+ ("pmap_kenter: Invalid physical address"));
KASSERT((sva & L3_OFFSET) == 0,
- ("pmap_kenter_device: Invalid virtual address"));
+ ("pmap_kenter: Invalid virtual address"));
KASSERT((size & PAGE_MASK) == 0,
- ("pmap_kenter_device: Mapping is not page-sized"));
+ ("pmap_kenter: Mapping is not page-sized"));
va = sva;
while (size != 0) {
pde = pmap_pde(kernel_pmap, va, &lvl);
KASSERT(pde != NULL,
- ("pmap_kenter_device: Invalid page entry, va: 0x%lx", va));
- KASSERT(lvl == 2,
- ("pmap_kenter_device: Invalid level %d", lvl));
+ ("pmap_kenter: Invalid page entry, va: 0x%lx", va));
+ KASSERT(lvl == 2, ("pmap_kenter: Invalid level %d", lvl));
pte = pmap_l2_to_l3(pde, va);
pmap_load_store(pte, (pa & ~L3_OFFSET) | ATTR_DEFAULT |
- ATTR_IDX(DEVICE_MEMORY) | L3_PAGE);
+ ATTR_IDX(mode) | L3_PAGE);
PTE_SYNC(pte);
va += PAGE_SIZE;
@@ -1072,6 +1071,13 @@ pmap_kenter_device(vm_offset_t sva, vm_s
pmap_invalidate_range(kernel_pmap, sva, va);
}
+void
+pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa)
+{
+
+ pmap_kenter(sva, size, pa, DEVICE_MEMORY);
+}
+
/*
* Remove a page from the kernel pagetables.
*/
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
