Module Name: src
Committed By: skrll
Date: Fri Mar 20 19:48:04 UTC 2020
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
src/sys/arch/arm/arm32: genassym.cf
Log Message:
Really use armv7 noncache memory attribute for early kernel mapping and
not SO
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/arm/arm32/genassym.cf
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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.15 src/sys/arch/arm/arm/armv6_start.S:1.16
--- src/sys/arch/arm/arm/armv6_start.S:1.15 Sat Feb 15 08:16:10 2020
+++ src/sys/arch/arm/arm/armv6_start.S Fri Mar 20 19:48:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.15 2020/02/15 08:16:10 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.16 2020/03/20 19:48:03 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -257,8 +257,8 @@ arm_build_translation_table:
ldr r0, =(L1_S_SIZE - 1)
bic R_PA, R_PA, r0
- // attribute to map kernel - run without L1_S_CACHEABLE
- ldr R_ATTR, =(L1_S_PROTO | L1_S_AP_KRW)
+ // attribute to map kernel
+ ldr R_ATTR, =(L1_S_PROTO | L1_S_AP_KRW | L1_S_NOCACHE)
bl arm_boot_l1pt_init
/*
@@ -287,8 +287,8 @@ arm_build_translation_table:
adr R_PA, generic_start // PA of kernel
bic R_PA, r2 // ...rounded down to L1_S boundary
- // attribute to map kernel - run without L1_S_CACHEABLE
- ldr R_ATTR, =(L1_S_PROTO | L1_S_AP_KRW)
+ // attribute to map kernel
+ ldr R_ATTR, =(L1_S_PROTO | L1_S_AP_KRW | L1_S_NOCACHE)
bl arm_boot_l1pt_entry
#if defined(FDTBASE)
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.88 src/sys/arch/arm/arm32/genassym.cf:1.89
--- src/sys/arch/arm/arm32/genassym.cf:1.88 Tue Feb 18 10:33:38 2020
+++ src/sys/arch/arm/arm32/genassym.cf Fri Mar 20 19:48:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.88 2020/02/18 10:33:38 skrll Exp $
+# $NetBSD: genassym.cf,v 1.89 2020/03/20 19:48:03 skrll Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -109,6 +109,7 @@ define L1_S_FRAME L1_S_FRAME
define L1_S_SHIFT L1_S_SHIFT
define L1_S_SIZE L1_S_SIZE
define L1_S_CACHEABLE L1_S_C|L1_S_B|L1_S_V6_S
+define L1_S_NOCACHE L1_S_XS_TEX(1)
define L1_S_B L1_S_B
define L1_S_C L1_S_C
define L1_S_V6_S L1_S_V6_S
