Forgot to attach the patch with the minor fixes.. here it is.
- Frank
diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c
b/xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -256,9 +256,10 @@ static int fill_vmsr_data(int cpu, struc
d->arch.vmca_msrs.nr_injection++;
printk(KERN_DEBUG "MCE: Found error @[CPU%d BANK%d "
- "status %lx addr %lx domid %d]\n ",
+ "status %p addr %p domid %d]\n ",
entry->cpu, mc_bank->mc_bank,
- mc_bank->mc_status, mc_bank->mc_addr, mc_bank->mc_domid);
+ _p(mc_bank->mc_status), _p(mc_bank->mc_addr),
+ mc_bank->mc_domid);
}
return 0;
}
@@ -426,7 +427,7 @@ static void severity_scan(void)
* recovered, we need to RESET for avoiding DOM0 LOG missing
*/
for ( i = 0; i < nr_mce_banks; i++) {
- rdmsrl(MSR_IA32_MC0_STATUS + 4 * i , status);
+ mca_rdmsrl(MSR_IA32_MC0_STATUS + 4 * i , status);
if ( !(status & MCi_STATUS_VAL) )
continue;
/* MCE handler only handles UC error */
@@ -434,7 +435,12 @@ static void severity_scan(void)
continue;
if ( !(status & MCi_STATUS_EN) )
continue;
- if (status & MCi_STATUS_PCC)
+ /*
+ * If this was an injected error, keep going, since the
+ * interposed value will be lost at reboot.
+ */
+ if (status & MCi_STATUS_PCC && intpose_lookup(smp_processor_id(),
+ MSR_IA32_MC0_STATUS + 4 * i, NULL) == NULL)
mc_panic("pcc = 1, cpu unable to continue\n");
}
@@ -519,8 +525,8 @@ static void intel_machine_check(struct c
/* Pick one CPU to clear MCIP */
if (!test_and_set_bool(mce_process_lock)) {
- rdmsrl(MSR_IA32_MCG_STATUS, gstatus);
- wrmsrl(MSR_IA32_MCG_STATUS, gstatus & ~MCG_STATUS_MCIP);
+ mca_rdmsrl(MSR_IA32_MCG_STATUS, gstatus);
+ mca_wrmsrl(MSR_IA32_MCG_STATUS, gstatus & ~MCG_STATUS_MCIP);
if (worst >= 3) {
printk(KERN_WARNING "worst=3 should have caused RESET\n");
@@ -843,7 +849,7 @@ int intel_mce_wrmsr(u32 msr, u32 lo, u32
break;
}
d->arch.vmca_msrs.mcg_status = value;
- printk(KERN_DEBUG "MCE: wrmsr MCG_CTL %lx\n", value);
+ printk(KERN_DEBUG "MCE: wrmsr MCG_CTL %p\n", _p(value));
break;
case MSR_IA32_MC0_CTL2:
case MSR_IA32_MC1_CTL2:
@@ -905,7 +911,7 @@ int intel_mce_wrmsr(u32 msr, u32 lo, u32
}
printk(KERN_DEBUG "MCE: wmrsr mci_status in vMCE# context\n");
}
- printk(KERN_DEBUG "MCE: wrmsr mci_status val:%lx\n", value);
+ printk(KERN_DEBUG "MCE: wrmsr mci_status val:%p\n", _p(value));
break;
}
spin_unlock(&mce_locks);
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -2215,8 +2215,8 @@ static int emulate_privileged_op(struct
break;
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
if ( intel_mce_wrmsr(regs->ecx, eax, edx) != 0) {
- gdprintk(XENLOG_ERR, "MCE: vMCE MSRS(%lx) Write"
- " (%x:%x) Fails! ", regs->ecx, edx, eax);
+ gdprintk(XENLOG_ERR, "MCE: vMCE MSRS(%p) Write"
+ " (%x:%x) Fails! ", _p(regs->ecx), edx, eax);
goto fail;
}
break;
@@ -2313,7 +2313,7 @@ static int emulate_privileged_op(struct
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
if ( intel_mce_rdmsr(regs->ecx, &eax, &edx) != 0)
- printk(KERN_ERR "MCE: Not MCE MSRs %lx\n", regs->ecx);
+ printk(KERN_ERR "MCE: Not MCE MSRs %p\n", _p(regs->ecx));
}
break;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home