Module Name: src
Committed By: martin
Date: Wed Dec 28 19:16:25 UTC 2016
Modified Files:
src/sys/arch/sparc64/include: ctlreg.h
src/sys/arch/sparc64/sparc64: cpu.c pmap.c
Log Message:
Rename the "flush" macro to "sparc_flush_icache", the former is way too
generic for a macro name.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc64/include/ctlreg.h
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.305 -r1.306 src/sys/arch/sparc64/sparc64/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/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.63 src/sys/arch/sparc64/include/ctlreg.h:1.64
--- src/sys/arch/sparc64/include/ctlreg.h:1.63 Wed Feb 3 20:33:52 2016
+++ src/sys/arch/sparc64/include/ctlreg.h Wed Dec 28 19:16:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.63 2016/02/03 20:33:52 palle Exp $ */
+/* $NetBSD: ctlreg.h,v 1.64 2016/12/28 19:16:25 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -865,8 +865,9 @@ SPARC64_ST_DEF64(stxa, uint64_t)
-/* flush address from data cache */
-#define flush(loc) __asm volatile("flush %0" : : "r" ((__uintptr_t)(loc)))
+/* flush address from cache */
+#define sparc_flush_icache(loc) __asm \
+ volatile("flush %0" : : "r" ((__uintptr_t)(loc)))
/*
* SPARC V9 memory barrier instructions.
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.128 src/sys/arch/sparc64/sparc64/cpu.c:1.129
--- src/sys/arch/sparc64/sparc64/cpu.c:1.128 Sun Apr 17 14:32:03 2016
+++ src/sys/arch/sparc64/sparc64/cpu.c Wed Dec 28 19:16:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.128 2016/04/17 14:32:03 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.129 2016/12/28 19:16:25 martin Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.128 2016/04/17 14:32:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.129 2016/12/28 19:16:25 martin Exp $");
#include "opt_multiprocessor.h"
@@ -720,8 +720,9 @@ cpu_hatch(void)
char *v = (char*)CPUINFO_VA;
int i;
+ /* XXX - why flush the icache here? but should be harmless */
for (i = 0; i < 4*PAGE_SIZE; i += sizeof(long))
- flush(v + i);
+ sparc_flush_icache(v + i);
cpu_pmap_init(curcpu());
CPUSET_ADD(cpus_active, cpu_number());
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.305 src/sys/arch/sparc64/sparc64/pmap.c:1.306
--- src/sys/arch/sparc64/sparc64/pmap.c:1.305 Thu Dec 22 14:47:59 2016
+++ src/sys/arch/sparc64/sparc64/pmap.c Wed Dec 28 19:16:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.305 2016/12/22 14:47:59 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.306 2016/12/28 19:16:25 martin Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.305 2016/12/22 14:47:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.306 2016/12/28 19:16:25 martin Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -576,7 +576,7 @@ pmap_mp_init(void)
}
for (i = 0; i < PAGE_SIZE; i += sizeof(long))
- flush(v + i);
+ sparc_flush_icache(v + i);
cpu_spinup_trampoline = (vaddr_t)v;
}
