|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH V2] x86, mce: Consolidate AMD mcheck initialization
amd_k8.c did a lot of common work and very little K8
specific work. So merge init functions of amd_f10.c and
amd_k8.c and move it into the common amd_mcheck_init
handler. With that done, there is not much left in either
files, so fold all code into just one file - mce_amd.c
While at it, update the comments regarding documentation
with correct URL's and revision numbers.
Also, update copyright info.
Changes in V2:
- Fix coding style issues
Signed-off-by: Aravind Gopalakrishnan <aravind.gopalakrishnan@xxxxxxx>
---
xen/arch/x86/cpu/mcheck/Makefile | 2 -
xen/arch/x86/cpu/mcheck/amd_f10.c | 118 ---------------------------
xen/arch/x86/cpu/mcheck/amd_k8.c | 117 ---------------------------
xen/arch/x86/cpu/mcheck/mce_amd.c | 162 +++++++++++++++++++++++++++++++++----
4 files changed, 147 insertions(+), 252 deletions(-)
delete mode 100644 xen/arch/x86/cpu/mcheck/amd_f10.c
delete mode 100644 xen/arch/x86/cpu/mcheck/amd_k8.c
diff --git a/xen/arch/x86/cpu/mcheck/Makefile b/xen/arch/x86/cpu/mcheck/Makefile
index c8cd5f9..0d63ff9 100644
--- a/xen/arch/x86/cpu/mcheck/Makefile
+++ b/xen/arch/x86/cpu/mcheck/Makefile
@@ -1,6 +1,4 @@
obj-y += amd_nonfatal.o
-obj-y += amd_k8.o
-obj-y += amd_f10.o
obj-y += mce_amd.o
obj-y += mcaction.o
obj-y += barrier.o
diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c
b/xen/arch/x86/cpu/mcheck/amd_f10.c
deleted file mode 100644
index 03797ab..0000000
--- a/xen/arch/x86/cpu/mcheck/amd_f10.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * MCA implementation for AMD Family10 CPUs
- * Copyright (c) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-/* K8 common MCA documentation published at
- *
- * AMD64 Architecture Programmer's Manual Volume 2:
- * System Programming
- * Publication # 24593 Revision: 3.12
- * Issue Date: September 2006
- */
-
-/* Family10 MCA documentation published at
- *
- * BIOS and Kernel Developer's Guide
- * For AMD Family 10h Processors
- * Publication # 31116 Revision: 1.08
- * Isse Date: June 10, 2007
- */
-
-
-#include <xen/init.h>
-#include <xen/types.h>
-
-#include <asm/msr.h>
-
-#include "mce.h"
-#include "mce_quirks.h"
-#include "x86_mca.h"
-#include "mce_amd.h"
-#include "mcaction.h"
-
-static struct mcinfo_extended *
-amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status)
-{
- struct mcinfo_extended *mc_ext;
-
- /* Family 0x10 introduced additional MSR that belong to the
- * northbridge bank (4). */
- if (mi == NULL || bank != 4)
- return NULL;
-
- if (!(status & MCi_STATUS_VAL))
- return NULL;
-
- if (!(status & MCi_STATUS_MISCV))
- return NULL;
-
- mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext));
- if (!mc_ext)
- {
- mi->flags |= MCINFO_FLAGS_UNCOMPLETE;
- return NULL;
- }
-
- mc_ext->common.type = MC_TYPE_EXTENDED;
- mc_ext->common.size = sizeof(*mc_ext);
- mc_ext->mc_msrs = 3;
-
- mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1;
- mc_ext->mc_msr[1].reg = MSR_F10_MC4_MISC2;
- mc_ext->mc_msr[2].reg = MSR_F10_MC4_MISC3;
-
- mc_ext->mc_msr[0].value = mca_rdmsr(MSR_F10_MC4_MISC1);
- mc_ext->mc_msr[1].value = mca_rdmsr(MSR_F10_MC4_MISC2);
- mc_ext->mc_msr[2].value = mca_rdmsr(MSR_F10_MC4_MISC3);
-
- return mc_ext;
-}
-
-/* AMD Family10 machine check */
-enum mcheck_type amd_f10_mcheck_init(struct cpuinfo_x86 *c)
-{
- enum mcequirk_amd_flags quirkflag = mcequirk_lookup_amd_quirkdata(c);
-
- if (amd_k8_mcheck_init(c) == mcheck_none)
- return mcheck_none;
-
- if (quirkflag == MCEQUIRK_F10_GART)
- mcequirk_amd_apply(quirkflag);
-
- x86_mce_callback_register(amd_f10_handler);
- mce_recoverable_register(mc_amd_recoverable_scan);
- mce_register_addrcheck(mc_amd_addrcheck);
-
- return mcheck_amd_famXX;
-}
-
-/* amd specific MCA MSR */
-int vmce_amd_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
-{
- /* Do nothing as we don't emulate this MC bank currently */
- mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val);
- return 1;
-}
-
-int vmce_amd_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val)
-{
- /* Assign '0' as we don't emulate this MC bank currently */
- *val = 0;
- return 1;
-}
diff --git a/xen/arch/x86/cpu/mcheck/amd_k8.c b/xen/arch/x86/cpu/mcheck/amd_k8.c
deleted file mode 100644
index 8ff359c..0000000
--- a/xen/arch/x86/cpu/mcheck/amd_k8.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * MCA implementation for AMD K8 CPUs
- * Copyright (c) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-/* K8 common MCA documentation published at
- *
- * AMD64 Architecture Programmer's Manual Volume 2:
- * System Programming
- * Publication # 24593 Revision: 3.12
- * Issue Date: September 2006
- *
- * URL:
- *
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/24593.pdf
- */
-
-/* The related documentation for K8 Revisions A - E is:
- *
- * BIOS and Kernel Developer's Guide for
- * AMD Athlon 64 and AMD Opteron Processors
- * Publication # 26094 Revision: 3.30
- * Issue Date: February 2006
- *
- * URL:
- *
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26094.PDF
- */
-
-/* The related documentation for K8 Revisions F - G is:
- *
- * BIOS and Kernel Developer's Guide for
- * AMD NPT Family 0Fh Processors
- * Publication # 32559 Revision: 3.04
- * Issue Date: December 2006
- *
- * URL:
- *
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
- */
-
-
-#include <xen/config.h>
-#include <xen/init.h>
-#include <xen/types.h>
-#include <xen/kernel.h>
-#include <xen/smp.h>
-#include <xen/sched.h>
-#include <xen/sched-if.h>
-#include <xen/softirq.h>
-
-#include <asm/processor.h>
-#include <asm/shared.h>
-#include <asm/system.h>
-#include <asm/msr.h>
-
-#include "mce.h"
-#include "mce_quirks.h"
-
-/* Machine Check Handler for AMD K8 family series */
-static void k8_machine_check(struct cpu_user_regs *regs, long error_code)
-{
- mcheck_cmn_handler(regs, error_code, mca_allbanks,
- __get_cpu_var(mce_clear_banks));
-}
-
-static int k8_need_clearbank_scan(enum mca_source who, uint64_t status)
-{
- if (who != MCA_MCE_SCAN)
- return 1;
-
- /*
- * For fatal error, it shouldn't be cleared so that sticky bank
- * have a chance to be handled after reboot by polling.
- */
- if ((status & MCi_STATUS_UC) && (status & MCi_STATUS_PCC))
- return 0;
-
- return 1;
-}
-
-/* AMD K8 machine check */
-enum mcheck_type amd_k8_mcheck_init(struct cpuinfo_x86 *c)
-{
- uint32_t i;
- enum mcequirk_amd_flags quirkflag;
-
- quirkflag = mcequirk_lookup_amd_quirkdata(c);
-
- mce_handler_init();
- x86_mce_vector_register(k8_machine_check);
- mce_need_clearbank_register(k8_need_clearbank_scan);
-
- for (i = 0; i < nr_mce_banks; i++) {
- if (quirkflag == MCEQUIRK_K8_GART && i == 4) {
- mcequirk_amd_apply(quirkflag);
- } else {
- /* Enable error reporting of all errors */
- wrmsrl(MSR_IA32_MCx_CTL(i), 0xffffffffffffffffULL);
- wrmsrl(MSR_IA32_MCx_STATUS(i), 0x0ULL);
- }
- }
-
- return mcheck_amd_k8;
-}
diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c
b/xen/arch/x86/cpu/mcheck/mce_amd.c
index 74ee115..82ad466 100644
--- a/xen/arch/x86/cpu/mcheck/mce_amd.c
+++ b/xen/arch/x86/cpu/mcheck/mce_amd.c
@@ -1,6 +1,6 @@
/*
* common MCA implementation for AMD CPUs.
- * Copyright (c) 2012 Advanced Micro Devices, Inc.
+ * Copyright (c) 2012-2014 Advanced Micro Devices, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +17,50 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+/* K8 common MCA documentation published at
+ *
+ * AMD64 Architecture Programmer's Manual Volume 2:
+ * System Programming
+ * Publication # 24593 Revision: 3.24
+ * Issue Date: October 2013
+ *
+ * URL:
+ * http://support.amd.com/TechDocs/24593.pdf
+ */
+
+/* The related documentation for K8 Revisions A - E is:
+ *
+ * BIOS and Kernel Developer's Guide for
+ * AMD Athlon 64 and AMD Opteron Processors
+ * Publication # 26094 Revision: 3.30
+ * Issue Date: February 2006
+ *
+ * URL:
+ * http://support.amd.com/TechDocs/26094.PDF
+ */
+
+/* The related documentation for K8 Revisions F - G is:
+ *
+ * BIOS and Kernel Developer's Guide for
+ * AMD NPT Family 0Fh Processors
+ * Publication # 32559 Revision: 3.08
+ * Issue Date: July 2007
+ *
+ * URL:
+ * http://support.amd.com/TechDocs/32559.pdf
+ */
+
+/* Family10 MCA documentation published at
+ *
+ * BIOS and Kernel Developer's Guide
+ * For AMD Family 10h Processors
+ * Publication # 31116 Revision: 3.62
+ * Isse Date: January 11, 2013
+ *
+ * URL:
+ * http://support.amd.com/TechDocs/31116.pdf
+ */
+
#include <xen/init.h>
#include <xen/types.h>
@@ -27,8 +71,8 @@
#include "x86_mca.h"
#include "mce_amd.h"
#include "mcaction.h"
-
#include "mce_quirks.h"
+#include "vmce.h"
#define ANY -1
@@ -158,24 +202,112 @@ int mcequirk_amd_apply(enum mcequirk_amd_flags flags)
return 0;
}
+static struct mcinfo_extended *
+amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status)
+{
+ struct mcinfo_extended *mc_ext;
+
+ /* Family 0x10 introduced additional MSR that belong to the
+ * northbridge bank (4). */
+ if (mi == NULL || bank != 4)
+ return NULL;
+
+ if (!(status & MCi_STATUS_VAL))
+ return NULL;
+
+ if (!(status & MCi_STATUS_MISCV))
+ return NULL;
+
+ mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext));
+ if (!mc_ext)
+ {
+ mi->flags |= MCINFO_FLAGS_UNCOMPLETE;
+ return NULL;
+ }
+
+ mc_ext->common.type = MC_TYPE_EXTENDED;
+ mc_ext->common.size = sizeof(*mc_ext);
+ mc_ext->mc_msrs = 3;
+
+ mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1;
+ mc_ext->mc_msr[1].reg = MSR_F10_MC4_MISC2;
+ mc_ext->mc_msr[2].reg = MSR_F10_MC4_MISC3;
+
+ mc_ext->mc_msr[0].value = mca_rdmsr(MSR_F10_MC4_MISC1);
+ mc_ext->mc_msr[1].value = mca_rdmsr(MSR_F10_MC4_MISC2);
+ mc_ext->mc_msr[2].value = mca_rdmsr(MSR_F10_MC4_MISC3);
+
+ return mc_ext;
+}
+
+/* Common AMD Machine Check Handler for AMD K8 and higher */
+static void amd_cmn_machine_check(struct cpu_user_regs *regs, long error_code)
+{
+ mcheck_cmn_handler(regs, error_code, mca_allbanks,
+ __get_cpu_var(mce_clear_banks));
+}
+
+static int amd_need_clearbank_scan(enum mca_source who, uint64_t status)
+{
+ if (who != MCA_MCE_SCAN)
+ return 1;
+
+ /*
+ * For fatal error, it shouldn't be cleared so that sticky bank
+ * have a chance to be handled after reboot by polling.
+ */
+ if ((status & MCi_STATUS_UC) && (status & MCi_STATUS_PCC))
+ return 0;
+
+ return 1;
+}
+
+/* AMD specific MCA MSR */
+int vmce_amd_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
+{
+ /* Do nothing as we don't emulate this MC bank currently */
+ mce_printk(MCE_VERBOSE, "MCE: wr msr %#"PRIx64"\n", val);
+ return 1;
+}
+
+int vmce_amd_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val)
+{
+ /* Assign '0' as we don't emulate this MC bank currently */
+ *val = 0;
+ return 1;
+}
+
enum mcheck_type
amd_mcheck_init(struct cpuinfo_x86 *ci)
{
- enum mcheck_type rc = mcheck_none;
+ uint32_t i;
+ enum mcequirk_amd_flags quirkflag = mcequirk_lookup_amd_quirkdata(ci);
- switch ( ci->x86 )
- {
- default:
- /* Assume that machine check support is available.
- * The minimum provided support is at least the K8. */
- case 0xf:
- rc = amd_k8_mcheck_init(ci);
- break;
+ /* Assume that machine check support is available.
+ * The minimum provided support is at least the K8. */
+ mce_handler_init();
+ x86_mce_vector_register(amd_cmn_machine_check);
+ mce_need_clearbank_register(amd_need_clearbank_scan);
- case 0x10 ... 0x17:
- rc = amd_f10_mcheck_init(ci);
- break;
+ for (i = 0; i < nr_mce_banks; i++) {
+ if (quirkflag == MCEQUIRK_K8_GART && i == 4) {
+ mcequirk_amd_apply(quirkflag);
+ } else {
+ /* Enable error reporting of all errors */
+ wrmsrl(MSR_IA32_MCx_CTL(i), 0xffffffffffffffffULL);
+ wrmsrl(MSR_IA32_MCx_STATUS(i), 0x0ULL);
+ }
}
- return rc;
+ if ( ci->x86 == 0xf )
+ return mcheck_amd_k8;
+
+ if (quirkflag == MCEQUIRK_F10_GART)
+ mcequirk_amd_apply(quirkflag);
+
+ x86_mce_callback_register(amd_f10_handler);
+ mce_recoverable_register(mc_amd_recoverable_scan);
+ mce_register_addrcheck(mc_amd_addrcheck);
+
+ return mcheck_amd_famXX;
}
--
1.7.9.5
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |