CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Fri Nov 13 05:22:19 UTC 2009

Modified Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c
Added Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_subr.S
Removed Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixls_subr.S

Log Message:
- rmixls_subr.S is replaced by rmixl_subr.S
- those subroutine names changed accordingly


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/rmi/rmixl_subr.S
cvs rdiff -u -r1.1.2.1 -r0 src/sys/arch/mips/rmi/rmixls_subr.S

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/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.1	Mon Nov  9 10:17:06 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie.c	Fri Nov 13 05:22:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_pcie.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $	*/
+/*	$NetBSD: rmixl_pcie.c,v 1.1.2.2 2009/11/13 05:22:19 cliff Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.2 2009/11/13 05:22:19 cliff Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -224,9 +224,9 @@
 {
 	uint64_t r;
 
-	r = rmixls_mfcr(RMIXL_PCR_L1D_CONFIG0);
-	rmixls_mtcr(RMIXL_PCR_L1D_CONFIG0, r & ~0x2e);
-	rmixls_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG, 0);
+	r = rmixl_mfcr(RMIXL_PCR_L1D_CONFIG0);
+	rmixl_mtcr(RMIXL_PCR_L1D_CONFIG0, r & ~0x2e);
+	rmixl_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG, 0);
 	return r;
 }
 
@@ -239,16 +239,16 @@
 static inline void
 rmixl_cache_err_restore(uint64_t r)
 {
-	rmixls_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG, 0);
-	rmixls_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_OVF_LO, 0);
-	rmixls_mtcr(RMIXL_PCR_L1D_CACHE_INTERRUPT, 0);
-	rmixls_mtcr(RMIXL_PCR_L1D_CONFIG0, r);
+	rmixl_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG, 0);
+	rmixl_mtcr(RMIXL_PCR_L1D_CACHE_ERROR_OVF_LO, 0);
+	rmixl_mtcr(RMIXL_PCR_L1D_CACHE_INTERRUPT, 0);
+	rmixl_mtcr(RMIXL_PCR_L1D_CONFIG0, r);
 }
 
 static inline uint64_t
 rmixl_cache_err_check(void)
 {
-	return rmixls_mfcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG);
+	return rmixl_mfcr(RMIXL_PCR_L1D_CACHE_ERROR_LOG);
 }
 
 static int  

Added files:

Index: src/sys/arch/mips/rmi/rmixl_subr.S
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_subr.S:1.1.2.1
--- /dev/null	Fri Nov 13 05:22:19 2009
+++ src/sys/arch/mips/rmi/rmixl_subr.S	Fri Nov 13 05:22:19 2009
@@ -0,0 +1,35 @@
+/*	$NetBSD: rmixl_subr.S,v 1.1.2.1 2009/11/13 05:22:19 cliff Exp $	*/
+
+#include "opt_cputype.h"
+
+#include <sys/cdefs.h>
+
+#include <mips/asm.h>
+#include <mips/cpuregs.h>
+
+	.set	push
+        .set    noreorder
+        .set    mips64
+        .text
+
+/*
+ * read XLS Processor Control register
+ *
+ * uint64_t rmixl_mfcr(u_int cr);
+ */
+LEAF(rmixl_mfcr)
+	j	ra
+	mfcr	v0, a0
+END(rmixl_mfcr)
+
+/*
+ * write XLS Processor Control register
+ *
+ * void rmixl_mtcr(u_int cr, uint64_t val);
+ */
+LEAF(rmixl_mtcr)
+	j	ra
+	mtcr	a1, a0
+END(rmixl_mtcr)
+
+	.set	pop