Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/arch/arm Pull up following revision(s) (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/41c2e63b404a
branches:  netbsd-9
changeset: 1001530:41c2e63b404a
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 27 19:06:22 2020 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #742):

        sys/arch/arm/arm32/pmap.c: revision 1.388
        sys/arch/arm/arm32/armv7_generic_space.c: revision 1.11
        sys/arch/arm/arm/cpufunc.c: revision 1.176
        sys/arch/arm/conf/Makefile.arm: revision 1.54 (via patch)
        sys/arch/arm/include/arm32/pmap.h: revision 1.161

Fix the armv[67] memory attributes for uncached memory.  Previously it was
mapped as strongly-ordered which meant that unaligned accesses would fault.
armv7_generic_bs_map now maps pages with PMAP_DEV which is treated as SO
bus_dma continues to use PMAP_NOCACHE as appropriate, but this now get
mapped to the correct memory attribute bits for armv[67]

DEVMAP_ENTRY usees a new flag PTE_DEV.

The workaround for the unaligned access faults is now removed.
XXX Other armv[67] boards bus_space implementations should be checked.
XXX There is scope to reduce the difference to aarch64

diffstat:

 sys/arch/arm/arm/cpufunc.c               |    6 +-
 sys/arch/arm/arm32/armv7_generic_space.c |    6 +-
 sys/arch/arm/arm32/pmap.c                |  117 +++++++++++++++++++++++++-----
 sys/arch/arm/conf/Makefile.arm           |   22 +-----
 sys/arch/arm/include/arm32/pmap.h        |   24 ++++-
 5 files changed, 122 insertions(+), 53 deletions(-)

diffs (truncated from 421 to 300 lines):

diff -r 9ea8b2f719c4 -r 41c2e63b404a sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Thu Feb 27 19:00:05 2020 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Thu Feb 27 19:06:22 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.175 2018/10/20 06:35:34 skrll Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.175.4.1 2020/02/27 19:06:23 martin Exp $ */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.175 2018/10/20 06:35:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.175.4.1 2020/02/27 19:06:23 martin Exp $");
 
 #include "opt_arm_start.h"
 #include "opt_compat_netbsd.h"
@@ -1776,7 +1776,7 @@
 #ifdef ARM11_CACHE_WRITE_THROUGH
                pmap_pte_init_arm11();
 #else
-               pmap_pte_init_generic();
+               pmap_pte_init_armv6();
 #endif
                if (arm_cache_prefer_mask)
                        uvmexp.ncolors = (arm_cache_prefer_mask >> PGSHIFT) + 1;
diff -r 9ea8b2f719c4 -r 41c2e63b404a sys/arch/arm/arm32/armv7_generic_space.c
--- a/sys/arch/arm/arm32/armv7_generic_space.c  Thu Feb 27 19:00:05 2020 +0000
+++ b/sys/arch/arm/arm32/armv7_generic_space.c  Thu Feb 27 19:06:22 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armv7_generic_space.c,v 1.10 2018/11/19 10:45:47 jmcneill Exp $        */
+/*     $NetBSD: armv7_generic_space.c,v 1.10.4.1 2020/02/27 19:06:23 martin Exp $      */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.10 2018/11/19 10:45:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.10.4.1 2020/02/27 19:06:23 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -319,7 +319,7 @@
        else if (flag & BUS_SPACE_MAP_CACHEABLE)
                pmapflags = 0;
        else
-               pmapflags = PMAP_NOCACHE;
+               pmapflags = PMAP_DEV;
 
        for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
                pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
diff -r 9ea8b2f719c4 -r 41c2e63b404a sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Thu Feb 27 19:00:05 2020 +0000
+++ b/sys/arch/arm/arm32/pmap.c Thu Feb 27 19:06:22 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.373.2.1 2020/02/10 19:20:01 martin Exp $    */
+/*     $NetBSD: pmap.c,v 1.373.2.2 2020/02/27 19:06:22 martin Exp $    */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -221,7 +221,7 @@
 #include <arm/db_machdep.h>
 #endif
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.373.2.1 2020/02/10 19:20:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.373.2.2 2020/02/27 19:06:22 martin Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -3740,8 +3740,11 @@
                if (!(flags & PMAP_NOCACHE))
                        npte |= pte_l2_s_cache_mode_pt;
        } else {
-               switch (flags & PMAP_CACHE_MASK) {
+               switch (flags & (PMAP_CACHE_MASK | PMAP_DEV_MASK)) {
+               case PMAP_DEV ... PMAP_DEV | PMAP_CACHE_MASK:
+                       break;
                case PMAP_NOCACHE:
+                       npte |= pte_l2_s_nocache_mode;
                        break;
                case PMAP_WRITE_COMBINE:
                        npte |= pte_l2_s_wc_mode;
@@ -6650,8 +6653,7 @@
 
        switch (cache) {
        case PTE_NOCACHE:
-       default:
-               fl = 0;
+               fl = pte_l1_s_nocache_mode;
                break;
 
        case PTE_CACHE:
@@ -6661,6 +6663,11 @@
        case PTE_PAGETABLE:
                fl = pte_l1_s_cache_mode_pt;
                break;
+
+       case PTE_DEV:
+       default:
+               fl = 0;
+               break;
        }
 
        const pd_entry_t npde = L1_S_PROTO | pa |
@@ -6686,8 +6693,7 @@
 
        switch (cache) {
        case PTE_NOCACHE:
-       default:
-               npte = 0;
+               npte = pte_l2_s_nocache_mode;
                break;
 
        case PTE_CACHE:
@@ -6697,6 +6703,10 @@
        case PTE_PAGETABLE:
                npte = pte_l2_s_cache_mode_pt;
                break;
+
+       default:
+               npte = 0;
+               break;
        }
 
        if ((pdep[l1slot] & L1_TYPE_MASK) != L1_TYPE_C)
@@ -6765,10 +6775,9 @@
 
        switch (cache) {
        case PTE_NOCACHE:
-       default:
-               f1 = 0;
-               f2l = 0;
-               f2s = 0;
+               f1 = pte_l1_s_nocache_mode;
+               f2l = pte_l2_l_nocache_mode;
+               f2s = pte_l2_s_nocache_mode;
                break;
 
        case PTE_CACHE:
@@ -6782,6 +6791,13 @@
                f2l = pte_l2_l_cache_mode_pt;
                f2s = pte_l2_s_cache_mode_pt;
                break;
+
+       case PTE_DEV:
+       default:
+               f1 = 0;
+               f2l = 0;
+               f2s = 0;
+               break;
        }
 
        size = resid;
@@ -6993,16 +7009,19 @@
  * them (though, they shouldn't).
  */
 
+pt_entry_t     pte_l1_s_nocache_mode;
 pt_entry_t     pte_l1_s_cache_mode;
 pt_entry_t     pte_l1_s_wc_mode;
 pt_entry_t     pte_l1_s_cache_mode_pt;
 pt_entry_t     pte_l1_s_cache_mask;
 
+pt_entry_t     pte_l2_l_nocache_mode;
 pt_entry_t     pte_l2_l_cache_mode;
 pt_entry_t     pte_l2_l_wc_mode;
 pt_entry_t     pte_l2_l_cache_mode_pt;
 pt_entry_t     pte_l2_l_cache_mask;
 
+pt_entry_t     pte_l2_s_nocache_mode;
 pt_entry_t     pte_l2_s_cache_mode;
 pt_entry_t     pte_l2_s_wc_mode;
 pt_entry_t     pte_l2_s_cache_mode_pt;
@@ -7036,14 +7055,17 @@
 pmap_pte_init_generic(void)
 {
 
+       pte_l1_s_nocache_mode = 0;
        pte_l1_s_cache_mode = L1_S_B|L1_S_C;
        pte_l1_s_wc_mode = L1_S_B;
        pte_l1_s_cache_mask = L1_S_CACHE_MASK_generic;
 
+       pte_l2_l_nocache_mode = 0;
        pte_l2_l_cache_mode = L2_B|L2_C;
        pte_l2_l_wc_mode = L2_B;
        pte_l2_l_cache_mask = L2_L_CACHE_MASK_generic;
 
+       pte_l2_s_nocache_mode = 0;
        pte_l2_s_cache_mode = L2_B|L2_C;
        pte_l2_s_wc_mode = L2_B;
        pte_l2_s_cache_mask = L2_S_CACHE_MASK_generic;
@@ -7427,12 +7449,11 @@
 
 
 #if defined(CPU_ARM11MPCORE)
-
 void
 pmap_pte_init_arm11mpcore(void)
 {
 
-       /* cache mode is controlled by 5 bits (B, C, TEX) */
+       /* cache mode is controlled by 5 bits (B, C, TEX[2:0]) */
        pte_l1_s_cache_mask = L1_S_CACHE_MASK_armv6;
        pte_l2_l_cache_mask = L2_L_CACHE_MASK_armv6;
 #if defined(ARM11MPCORE_COMPAT_MMU) || defined(ARMV6_EXTENDED_SMALL_PAGE)
@@ -7511,6 +7532,54 @@
 #endif /* CPU_ARM11MPCORE */
 
 
+#if ARM_MMU_V6 == 1
+void
+pmap_pte_init_armv6(void)
+{
+       /*
+        * The ARMv6-A MMU is mostly compatible with generic. If the
+        * AP field is zero, that now means "no access" rather than
+        * read-only. The prototypes are a little different because of
+        * the XN bit.
+        */
+       pmap_pte_init_generic();
+
+       pte_l1_s_nocache_mode = L1_S_XS_TEX(1);
+       pte_l2_l_nocache_mode = L2_XS_L_TEX(1);
+       pte_l2_s_nocache_mode = L2_XS_T_TEX(1);
+
+#ifdef ARM11_COMPAT_MMU
+       /* with AP[0..3] */
+       pte_l1_ss_proto = L1_SS_PROTO_armv6;
+#else
+       pte_l1_s_cache_mask = L1_S_CACHE_MASK_armv6n;
+       pte_l2_l_cache_mask = L2_L_CACHE_MASK_armv6n;
+       pte_l2_s_cache_mask = L2_S_CACHE_MASK_armv6n;
+
+       pte_l1_ss_proto = L1_SS_PROTO_armv6;
+       pte_l1_s_proto = L1_S_PROTO_armv6;
+       pte_l1_c_proto = L1_C_PROTO_armv6;
+       pte_l2_s_proto = L2_S_PROTO_armv6n;
+
+       pte_l1_s_prot_u = L1_S_PROT_U_armv6;
+       pte_l1_s_prot_w = L1_S_PROT_W_armv6;
+       pte_l1_s_prot_ro = L1_S_PROT_RO_armv6;
+       pte_l1_s_prot_mask = L1_S_PROT_MASK_armv6;
+
+       pte_l2_l_prot_u = L2_L_PROT_U_armv6n;
+       pte_l2_l_prot_w = L2_L_PROT_W_armv6n;
+       pte_l2_l_prot_ro = L2_L_PROT_RO_armv6n;
+       pte_l2_l_prot_mask = L2_L_PROT_MASK_armv6n;
+
+       pte_l2_s_prot_u = L2_S_PROT_U_armv6n;
+       pte_l2_s_prot_w = L2_S_PROT_W_armv6n;
+       pte_l2_s_prot_ro = L2_S_PROT_RO_armv6n;
+       pte_l2_s_prot_mask = L2_S_PROT_MASK_armv6n;
+
+#endif
+}
+#endif /* ARM_MMU_V6 */
+
 #if ARM_MMU_V7 == 1
 void
 pmap_pte_init_armv7(void)
@@ -7525,6 +7594,10 @@
 
        pmap_needs_pte_sync = 1;
 
+       pte_l1_s_nocache_mode = L1_S_XS_TEX(1);
+       pte_l2_l_nocache_mode = L2_XS_L_TEX(1);
+       pte_l2_s_nocache_mode = L2_XS_T_TEX(1);
+
        pte_l1_s_cache_mask = L1_S_CACHE_MASK_armv7;
        pte_l2_l_cache_mask = L2_L_CACHE_MASK_armv7;
        pte_l2_s_cache_mask = L2_S_CACHE_MASK_armv7;
@@ -7676,22 +7749,28 @@
                                        ch = '.';
                                } else {
                                        occ--;
-                                       switch (pte & 0x0c) {
+                                       switch (pte & 0x4c) {
                                        case 0x00:
-                                               ch = 'D'; /* No cache No buff */
+                                               ch = 'N'; /* No cache No buff */
                                                break;
                                        case 0x04:
                                                ch = 'B'; /* No cache buff */
                                                break;
                                        case 0x08:
-                                               if (pte & 0x40)
-                                                       ch = 'm';
-                                               else
-                                                  ch = 'C'; /* Cache No buff */
+                                               ch = 'C'; /* Cache No buff */
                                                break;
                                        case 0x0c:
                                                ch = 'F'; /* Cache Buff */
                                                break;
+                                       case 0x40:
+                                               ch = 'D';
+                                               break;



Home | Main Index | Thread Index | Old Index