Module Name: src
Committed By: skrll
Date: Tue Jun 9 10:44:55 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Use armreg_auxctl_{read,write} instead of inline asm.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/sys/arch/arm/arm32/pmap.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/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.324 src/sys/arch/arm/arm32/pmap.c:1.325
--- src/sys/arch/arm/arm32/pmap.c:1.324 Mon Jun 1 19:16:44 2015
+++ src/sys/arch/arm/arm32/pmap.c Tue Jun 9 10:44:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.324 2015/06/01 19:16:44 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.325 2015/06/09 10:44:55 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.324 2015/06/01 19:16:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.325 2015/06/09 10:44:55 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -7206,9 +7206,9 @@ pmap_pte_init_xscale(void)
/*
* Disable ECC protection of page table access, for now.
*/
- __asm volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl));
+ auxctl = armreg_auxctl_read();
auxctl &= ~XSCALE_AUXCTL_P;
- __asm volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl));
+ armreg_auxctl_write(auxctl);
}
/*
@@ -7261,9 +7261,9 @@ xscale_setup_minidata(vaddr_t l1pt, vadd
/* Invalidate data and mini-data. */
__asm volatile("mcr p15, 0, %0, c7, c6, 0" : : "r" (0));
- __asm volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl));
+ auxctl = armreg_auxctl_read();
auxctl = (auxctl & ~XSCALE_AUXCTL_MD_MASK) | XSCALE_AUXCTL_MD_WB_RWA;
- __asm volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl));
+ armreg_auxctl_write(auxctl);
}
/*
