[src/trunk]: src/sys/arch/arm/arm32 Do not try to use direct map for prefetch...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7bd56fa55de
branches:  trunk
changeset: 465090:f7bd56fa55de
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Nov 05 10:21:31 2019 +0000

description:
Do not try to use direct map for prefetchable mappings

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 40e25e54b2ca -r f7bd56fa55de sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Tue Nov 05 09:59:16 2019 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Tue Nov 05 10:21:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.117 2019/11/05 09:57:47 jmcneill Exp $   */
+/*     $NetBSD: bus_dma.c,v 1.118 2019/11/05 10:21:31 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.117 2019/11/05 09:57:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.118 2019/11/05 10:21:31 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1339,7 +1339,7 @@
         * contiguous area then this area is already mapped.  Let's see if we
         * avoid having a separate mapping for it.
         */
-       if (nsegs == 1) {
+       if (nsegs == 1 && (flags & BUS_DMA_PREFETCHABLE) == 0) {
                /*
                 * If this is a non-COHERENT mapping, then the existing kernel
                 * mapping is already compatible with it.