Module Name: src
Committed By: skrll
Date: Tue Oct 23 12:23:20 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Correct inverted boolean logic for the coherent flag introduced in r1.61
Fixes slow nfs seen by msaitoh@
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/arm/arm32/bus_dma.c
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/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.65 src/sys/arch/arm/arm32/bus_dma.c:1.66
--- src/sys/arch/arm/arm32/bus_dma.c:1.65 Mon Oct 22 15:01:18 2012
+++ src/sys/arch/arm/arm32/bus_dma.c Tue Oct 23 12:23:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.65 2012/10/22 15:01:18 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.66 2012/10/23 12:23:20 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.65 2012/10/22 15:01:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.66 2012/10/23 12:23:20 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1408,7 +1408,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
}
#endif
curaddr = (*pde & s_frame) | (vaddr & s_offset);
- coherent = (*pde & L1_S_CACHE_MASK) != 0;
+ coherent = (*pde & L1_S_CACHE_MASK) == 0;
} else {
pt_entry_t pte = *ptep;
KDASSERTMSG((pte & L2_TYPE_MASK) != L2_TYPE_INV,
@@ -1418,11 +1418,11 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
== L2_TYPE_L)) {
curaddr = (pte & L2_L_FRAME) |
(vaddr & L2_L_OFFSET);
- coherent = (pte & L2_L_CACHE_MASK) != 0;
+ coherent = (pte & L2_L_CACHE_MASK) == 0;
} else {
curaddr = (pte & L2_S_FRAME) |
(vaddr & L2_S_OFFSET);
- coherent = (pte & L2_S_CACHE_MASK) != 0;
+ coherent = (pte & L2_S_CACHE_MASK) == 0;
}
}
} else {
