Author: jhb
Date: Wed Jul 28 21:52:09 2010
New Revision: 210577
URL: http://svn.freebsd.org/changeset/base/210577
Log:
The corrected error count field is dependent on CMCI, not TES.
MFC after: 1 week
Modified:
head/sys/amd64/include/specialreg.h
head/sys/i386/include/specialreg.h
head/sys/x86/x86/mca.c
Modified: head/sys/amd64/include/specialreg.h
==============================================================================
--- head/sys/amd64/include/specialreg.h Wed Jul 28 18:56:01 2010
(r210576)
+++ head/sys/amd64/include/specialreg.h Wed Jul 28 21:52:09 2010
(r210577)
@@ -372,10 +372,10 @@
#define MC_STATUS_MCA_ERROR 0x000000000000ffff
#define MC_STATUS_MODEL_ERROR 0x00000000ffff0000
#define MC_STATUS_OTHER_INFO 0x01ffffff00000000
-#define MC_STATUS_COR_COUNT 0x001fffc000000000 /* If
MCG_CAP_TES_P */
+#define MC_STATUS_COR_COUNT 0x001fffc000000000 /* If
MCG_CAP_CMCI_P */
#define MC_STATUS_TES_STATUS 0x0060000000000000 /* If
MCG_CAP_TES_P */
-#define MC_STATUS_AR 0x0080000000000000 /* If
MCG_CAP_CMCI_P */
-#define MC_STATUS_S 0x0100000000000000 /* If
MCG_CAP_CMCI_P */
+#define MC_STATUS_AR 0x0080000000000000 /* If
MCG_CAP_TES_P */
+#define MC_STATUS_S 0x0100000000000000 /* If
MCG_CAP_TES_P */
#define MC_STATUS_PCC 0x0200000000000000
#define MC_STATUS_ADDRV 0x0400000000000000
#define MC_STATUS_MISCV 0x0800000000000000
Modified: head/sys/i386/include/specialreg.h
==============================================================================
--- head/sys/i386/include/specialreg.h Wed Jul 28 18:56:01 2010
(r210576)
+++ head/sys/i386/include/specialreg.h Wed Jul 28 21:52:09 2010
(r210577)
@@ -441,10 +441,10 @@
#define MC_STATUS_MCA_ERROR 0x000000000000ffff
#define MC_STATUS_MODEL_ERROR 0x00000000ffff0000
#define MC_STATUS_OTHER_INFO 0x01ffffff00000000
-#define MC_STATUS_COR_COUNT 0x001fffc000000000 /* If
MCG_CAP_TES_P */
+#define MC_STATUS_COR_COUNT 0x001fffc000000000 /* If
MCG_CAP_CMCI_P */
#define MC_STATUS_TES_STATUS 0x0060000000000000 /* If
MCG_CAP_TES_P */
-#define MC_STATUS_AR 0x0080000000000000 /* If
MCG_CAP_CMCI_P */
-#define MC_STATUS_S 0x0100000000000000 /* If
MCG_CAP_CMCI_P */
+#define MC_STATUS_AR 0x0080000000000000 /* If
MCG_CAP_TES_P */
+#define MC_STATUS_S 0x0100000000000000 /* If
MCG_CAP_TES_P */
#define MC_STATUS_PCC 0x0200000000000000
#define MC_STATUS_ADDRV 0x0400000000000000
#define MC_STATUS_MISCV 0x0800000000000000
Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c Wed Jul 28 18:56:01 2010 (r210576)
+++ head/sys/x86/x86/mca.c Wed Jul 28 21:52:09 2010 (r210577)
@@ -256,7 +256,7 @@ mca_log(const struct mca_record *rec)
printf("UNCOR ");
else {
printf("COR ");
- if (rec->mr_mcg_cap & MCG_CAP_TES_P)
+ if (rec->mr_mcg_cap & MCG_CAP_CMCI_P)
printf("(%lld) ", ((long long)rec->mr_status &
MC_STATUS_COR_COUNT) >> 38);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
