Module Name:    src
Committed By:   macallan
Date:           Fri Jun  1 18:18:11 UTC 2018

Modified Files:
        src/sys/arch/powerpc/include/oea: spr.h

Log Message:
add functions to access SCOM registers on 970 CPUs


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/oea/spr.h

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/include/oea/spr.h
diff -u src/sys/arch/powerpc/include/oea/spr.h:1.5 src/sys/arch/powerpc/include/oea/spr.h:1.6
--- src/sys/arch/powerpc/include/oea/spr.h:1.5	Fri May  4 16:57:14 2018
+++ src/sys/arch/powerpc/include/oea/spr.h	Fri Jun  1 18:18:11 2018
@@ -1,8 +1,17 @@
-/*	$NetBSD: spr.h,v 1.5 2018/05/04 16:57:14 macallan Exp $	*/
+/*	$NetBSD: spr.h,v 1.6 2018/06/01 18:18:11 macallan Exp $	*/
 
 #ifndef _POWERPC_OEA_SPR_H_
 #define	_POWERPC_OEA_SPR_H_
 
+#if !defined(_LOCORE) && defined(_KERNEL)
+#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+
+#include <powerpc/psl.h>
+#include <powerpc/spr.h>
+
+#endif
+#endif
+
 /*
  * Special Purpose Register declarations.
  *
@@ -299,4 +308,50 @@
 #define	PMCN_TBLTRANS		 3 /* TBL bit transitions */
 #define	PCMN_IDISPATCH		 4 /* Instructions dispatched */
 
+#if !defined(_LOCORE) && defined(_KERNEL)
+
+#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+
+static inline uint64_t
+scom_read(register_t address)
+{
+	register_t msr;
+	uint64_t ret;
+
+	msr = mfmsr();
+	mtmsr(msr & ~PSL_EE);
+	__asm volatile("isync;");
+
+	mtspr(SPR_SCOMC, address | SCOMC_READ);
+	__asm volatile("isync;");
+
+	ret = mfspr(SPR_SCOMD);
+	mtmsr(msr);
+	__asm volatile("isync;");
+
+	return ret;
+}
+
+static inline void
+scom_write(register_t address, uint64_t data)
+{
+	register_t msr;
+
+	msr = mfmsr();
+	mtmsr(msr & ~PSL_EE);
+	__asm volatile("isync;");
+
+	mtspr(SPR_SCOMD, data);
+	__asm volatile("isync;");
+	mtspr(SPR_SCOMC, address | SCOMC_WRITE);
+	__asm volatile("isync;");
+	
+	mtmsr(msr);
+	__asm volatile("isync;");
+}
+
+#endif /* defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64) */
+
+#endif /* !defined(_LOCORE) && defined(_KERNEL) */
+
 #endif /* !_POWERPC_SPR_H_ */

Reply via email to