Module Name: src
Committed By: skrll
Date: Mon Aug 12 10:28:04 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: pmap.h
Log Message:
Use PMAP_DEV in DEVMAP_ENTRY rather than pmap_map_chunk. It's clearer and
means pmap_map_chunk can be made to map other memory types.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.41 src/sys/arch/aarch64/aarch64/pmap.c:1.42
--- src/sys/arch/aarch64/aarch64/pmap.c:1.41 Fri May 17 06:05:07 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Aug 12 10:28:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.41 2019/05/17 06:05:07 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.42 2019/08/12 10:28:04 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41 2019/05/17 06:05:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.42 2019/08/12 10:28:04 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -283,7 +283,7 @@ pmap_map_chunk(vaddr_t va, paddr_t pa, v
blocksize = L2_SIZE;
attr = _pmap_pte_adjust_prot(L2_BLOCK, prot, VM_PROT_ALL, false);
- attr = _pmap_pte_adjust_cacheflags(attr, flags | PMAP_DEV);
+ attr = _pmap_pte_adjust_cacheflags(attr, flags);
/* user cannot execute, and kernel follows the prot */
attr |= (LX_BLKPAG_UXN|LX_BLKPAG_PXN);
if (prot & VM_PROT_EXECUTE)
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.24 src/sys/arch/aarch64/include/pmap.h:1.25
--- src/sys/arch/aarch64/include/pmap.h:1.24 Mon Apr 8 21:18:22 2019
+++ src/sys/arch/aarch64/include/pmap.h Mon Aug 12 10:28:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.24 2019/04/08 21:18:22 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.25 2019/08/12 10:28:04 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -207,7 +207,7 @@ paddr_t pmap_alloc_pdp(struct pmap *, st
.pd_pa = DEVMAP_TRUNC_ADDR(pa), \
.pd_size = DEVMAP_ROUND_SIZE(sz), \
.pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_flags = PMAP_NOCACHE \
+ .pd_flags = PMAP_DEV \
}
#define DEVMAP_ENTRY_END { 0 }
