svn commit: r210899 - in stable/7/sys: amd64/amd64 amd64/include
i386/i386 i386/include
John Baldwin
jhb at FreeBSD.org
Thu Aug 5 21:01:35 UTC 2010
Author: jhb
Date: Thu Aug 5 21:01:35 2010
New Revision: 210899
URL: http://svn.freebsd.org/changeset/base/210899
Log:
MFC 210577: The corrected error count field is dependent on CMCI, not TES.
Modified:
stable/7/sys/amd64/amd64/mca.c
stable/7/sys/amd64/include/specialreg.h
stable/7/sys/i386/i386/mca.c
stable/7/sys/i386/include/specialreg.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/amd64/amd64/mca.c
==============================================================================
--- stable/7/sys/amd64/amd64/mca.c Thu Aug 5 21:01:15 2010 (r210898)
+++ stable/7/sys/amd64/amd64/mca.c Thu Aug 5 21:01:35 2010 (r210899)
@@ -245,7 +245,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);
}
Modified: stable/7/sys/amd64/include/specialreg.h
==============================================================================
--- stable/7/sys/amd64/include/specialreg.h Thu Aug 5 21:01:15 2010 (r210898)
+++ stable/7/sys/amd64/include/specialreg.h Thu Aug 5 21:01:35 2010 (r210899)
@@ -363,10 +363,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: stable/7/sys/i386/i386/mca.c
==============================================================================
--- stable/7/sys/i386/i386/mca.c Thu Aug 5 21:01:15 2010 (r210898)
+++ stable/7/sys/i386/i386/mca.c Thu Aug 5 21:01:35 2010 (r210899)
@@ -252,7 +252,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);
}
Modified: stable/7/sys/i386/include/specialreg.h
==============================================================================
--- stable/7/sys/i386/include/specialreg.h Thu Aug 5 21:01:15 2010 (r210898)
+++ stable/7/sys/i386/include/specialreg.h Thu Aug 5 21:01:35 2010 (r210899)
@@ -432,10 +432,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
More information about the svn-src-stable-7
mailing list