Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/arm32 Correct inverted boolean logic for the co...



details:   https://anonhg.NetBSD.org/src/rev/5b98d878fc28
branches:  trunk
changeset: 782245:5b98d878fc28
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Oct 23 12:23:20 2012 +0000

description:
Correct inverted boolean logic for the coherent flag introduced in r1.61

Fixes slow nfs seen by msaitoh@

diffstat:

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

diffs (41 lines):

diff -r 581766a3e27d -r 5b98d878fc28 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Tue Oct 23 11:53:18 2012 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Tue Oct 23 12:23:20 2012 +0000
@@ -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 @@
                                }
 #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 @@
                                                    == 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 {



Home | Main Index | Thread Index | Old Index