Module Name: src
Committed By: matt
Date: Wed Feb 13 23:10:58 UTC 2013
Modified Files:
src/sys/arch/arm/cortex: pl310.c
Log Message:
simplify cache range op
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/pl310.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/cortex/pl310.c
diff -u src/sys/arch/arm/cortex/pl310.c:1.10 src/sys/arch/arm/cortex/pl310.c:1.11
--- src/sys/arch/arm/cortex/pl310.c:1.10 Tue Jan 22 09:04:12 2013
+++ src/sys/arch/arm/cortex/pl310.c Wed Feb 13 23:10:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pl310.c,v 1.10 2013/01/22 09:04:12 matt Exp $ */
+/* $NetBSD: pl310.c,v 1.11 2013/02/13 23:10:58 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.10 2013/01/22 09:04:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.11 2013/02/13 23:10:58 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -287,20 +287,16 @@ arml2cc_cache_range_op(paddr_t pa, psize
pa -= off;
}
len = roundup2(len, line_size);
- off = pa & PAGE_MASK;
- for (const paddr_t endpa = pa + len; pa < endpa; off = 0) {
- psize_t seglen = min(len, PAGE_SIZE - off);
-
- mutex_spin_enter(&sc->sc_lock);
- if (!sc->sc_enabled) {
- mutex_spin_exit(&sc->sc_lock);
- return;
- }
- for (paddr_t segend = pa + seglen; pa < segend; pa += line_size) {
- arml2cc_cache_op(sc, cache_op, pa, false);
- }
+ mutex_spin_enter(&sc->sc_lock);
+ if (__predict_false(!sc->sc_enabled)) {
mutex_spin_exit(&sc->sc_lock);
+ return;
}
+ for (const paddr_t endpa = pa + len; pa < endpa; pa += line_size) {
+ arml2cc_cache_op(sc, cache_op, pa, false);
+ }
+ arml2cc_cache_sync(sc);
+ mutex_spin_exit(&sc->sc_lock);
}
static void
@@ -308,7 +304,6 @@ arml2cc_sdcache_inv_range(vaddr_t va, pa
{
atomic_inc_64(&arml2cc_sc->sc_ev_inv.ev_count);
arml2cc_cache_range_op(pa, len, L2C_INV_PA);
- arml2cc_cache_sync(arml2cc_sc);
}
static void
@@ -316,7 +311,6 @@ arml2cc_sdcache_wb_range(vaddr_t va, pad
{
atomic_inc_64(&arml2cc_sc->sc_ev_wb.ev_count);
arml2cc_cache_range_op(pa, len, L2C_CLEAN_PA);
- arml2cc_cache_sync(arml2cc_sc);
}
static void
@@ -324,5 +318,4 @@ arml2cc_sdcache_wbinv_range(vaddr_t va,
{
atomic_inc_64(&arml2cc_sc->sc_ev_wbinv.ev_count);
arml2cc_cache_range_op(pa, len, L2C_CLEAN_INV_PA);
- arml2cc_cache_sync(arml2cc_sc);
}
