Module Name:    src
Committed By:   macallan
Date:           Fri Feb 16 18:02:10 UTC 2018

Modified Files:
        src/sys/arch/powerpc/oea: cpu_subr.c

Log Message:
use mtspr64() in bridge mode


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/powerpc/oea/cpu_subr.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/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.88 src/sys/arch/powerpc/oea/cpu_subr.c:1.89
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.88	Sun Jan 21 08:46:48 2018
+++ src/sys/arch/powerpc/oea/cpu_subr.c	Fri Feb 16 18:02:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_subr.c,v 1.88 2018/01/21 08:46:48 mrg Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.89 2018/02/16 18:02:10 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.88 2018/01/21 08:46:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.89 2018/02/16 18:02:10 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_ppccache.h"
@@ -644,17 +644,7 @@ cpu_setup(device_t self, struct cpu_info
 	if ((oeacpufeat & OEACPU_64_BRIDGE) != 0) {
 #endif
 		if (hid64_0 != hid64_0_save) {
-			/* ppc970 needs extra goop around writes to HID0 */
-			__asm volatile( "sync;" \
-					"mtspr %0,%1;" \
-					"mfspr %1,%0;" \
-					"mfspr %1,%0;" \
-					"mfspr %1,%0;" \
-					"mfspr %1,%0;" \
-					"mfspr %1,%0;" \
-					"mfspr %1,%0;" \
-					 : : "K"(SPR_HID0), "r"(hid64_0));
-			__asm volatile("sync;isync");
+			mtspr64(SPR_HID0, hid64_0);
 		}
 #if defined(PPC_OEA64_BRIDGE)
 	} else {

Reply via email to