Module Name: src
Committed By: matt
Date: Thu Jan 19 08:06:54 UTC 2012
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlreg.h
Log Message:
Fix IPI_CTRL_MAKE for RMIXLP
Correct PCITAGs for CDE/SRIO/RXE.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/sys/arch/mips/rmi/rmixlreg.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/mips/rmi/rmixlreg.h
diff -u src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.19 src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.20
--- src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.19 Wed Jan 4 16:17:54 2012
+++ src/sys/arch/mips/rmi/rmixlreg.h Thu Jan 19 08:06:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlreg.h,v 1.1.2.19 2012/01/04 16:17:54 matt Exp $ */
+/* $NetBSD: rmixlreg.h,v 1.1.2.20 2012/01/19 08:06:54 matt Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -1230,9 +1230,9 @@
#define RMIXLP_DMA_PCITAG _RMIXL_PCITAG(0,5,0)
#define RMIXLP_SAE_PCITAG _RMIXL_PCITAG(0,5,1)
#define RMIXLP_PKE_PCITAG _RMIXL_PCITAG(0,5,2)
-#define RMIXLP_CDE_PCITAG _RMIXL_PCITAG(0,5,3) // 8xx/4xx
-#define RMIXLP_SRIO_PCITAG _RMIXL_PCITAG(0,5,3) // 3xx
-#define RMIXLP_RXE_PCITAG _RMIXL_PCITAG(0,5,4)
+#define RMIXLP_CDE_PCITAG _RMIXL_PCITAG(0,5,3)
+#define RMIXLP_SRIO_PCITAG _RMIXL_PCITAG(0,5,4)
+#define RMIXLP_RXE_PCITAG _RMIXL_PCITAG(0,5,5)
#define RMIXLP_UART1_PCITAG _RMIXL_PCITAG(0,6,0)
#define RMIXLP_UART2_PCITAG _RMIXL_PCITAG(0,6,1)
@@ -1249,8 +1249,11 @@
/*
* PCI PCIe control (contains the IRT info)
*/
+#define PCI_RMIXLP_OQCOUNT _RMIXL_OFFSET(0x30)
+#define PCI_RMIXLP_POE_FLOWS _RMIXL_OFFSET(0x30)
#define PCI_RMIXLP_ONCHIP _RMIXL_OFFSET(0x31)
#define PCI_RMIXLP_OFFCHIP _RMIXL_OFFSET(0x32)
+#define PCI_RMIXLP_CONTEXTS _RMIXL_OFFSET(0x35)
#define PCI_RMIXLP_STATID _RMIXL_OFFSET(0x3c)
#define PCI_RMIXLP_IRTINFO _RMIXL_OFFSET(0x3d)
@@ -1494,7 +1497,7 @@
#define RMIXLP_PIC_IPI_CTRL_DT __BITS(15,0) /* Dest Thread Enbs */
#define RMIXLP_PIC_IPI_CTRL_MAKE(nmi, tmask, tag) \
(__SHIFTIN((nmi), RMIXLP_PIC_IPI_CTRL_NMI) \
- | __SHIFTIN((tag), RMIXL_PIC_IPI_CTRL_RIV) \
+ | __SHIFTIN((tag), RMIXLP_PIC_IPI_CTRL_RIV) \
| __SHIFTIN((tmask), RMIXLP_PIC_IPI_CTRL_DT))
/*
