From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [PATCH 05/35] Add function for checking mca broadcast of CPU Date: Thu, 6 Jan 2011 15:56:11 -0200 Message-ID: References: Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jin Dongming , Marcelo Tosatti To: Anthony Liguori Return-path: Received: from mx1.redhat.com ([209.132.183.28]:28747 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752118Ab1AFSDc (ORCPT ); Thu, 6 Jan 2011 13:03:32 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: From: Jin Dongming Add function for checking whether current CPU support mca broadcast. Signed-off-by: Jin Dongming Signed-off-by: Marcelo Tosatti --- target-i386/cpu.h | 1 + target-i386/helper.c | 33 +++++++++++++++++++++++++++++++++ target-i386/kvm.c | 6 +----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index f0c07cd..dddcd74 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -760,6 +760,7 @@ int cpu_x86_exec(CPUX86State *s); void cpu_x86_close(CPUX86State *s); void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg); void x86_cpudef_setup(void); +int cpu_x86_support_mca_broadcast(CPUState *env); int cpu_get_pic_interrupt(CPUX86State *s); /* MSDOS compatibility mode FPU exception support */ diff --git a/target-i386/helper.c b/target-i386/helper.c index 2cfb4a4..6dfa27d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -110,6 +110,32 @@ void cpu_x86_close(CPUX86State *env) qemu_free(env); } +static void cpu_x86_version(CPUState *env, int *family, int *model) +{ + int cpuver = env->cpuid_version; + + if (family == NULL || model == NULL) { + return; + } + + *family = (cpuver >> 8) & 0x0f; + *model = ((cpuver >> 12) & 0xf0) + ((cpuver >> 4) & 0x0f); +} + +/* Broadcast MCA signal for processor version 06H_EH and above */ +int cpu_x86_support_mca_broadcast(CPUState *env) +{ + int family = 0; + int model = 0; + + cpu_x86_version(env, &family, &model); + if ((family == 6 && model >= 14) || family > 6) { + return 1; + } + + return 0; +} + /***********************************************************/ /* x86 debug */ @@ -1080,6 +1106,13 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, return; } + if (broadcast) { + if (!cpu_x86_support_mca_broadcast(cenv)) { + fprintf(stderr, "Current CPU does not support broadcast\n"); + return; + } + } + if (kvm_enabled()) { if (broadcast) { flag |= MCE_BROADCAST; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8b868ad..2115a58 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1711,13 +1711,9 @@ static void hardware_memory_error(void) static void kvm_mce_broadcast_rest(CPUState *env) { CPUState *cenv; - int family, model, cpuver = env->cpuid_version; - - family = (cpuver >> 8) & 0xf; - model = ((cpuver >> 12) & 0xf0) + ((cpuver >> 4) & 0xf); /* Broadcast MCA signal for processor version 06H_EH and above */ - if ((family == 6 && model >= 14) || family > 6) { + if (cpu_x86_support_mca_broadcast(env)) { for (cenv = first_cpu; cenv != NULL; cenv = cenv->next_cpu) { if (cenv == env) { continue; -- 1.7.2.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=32932 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PauBJ-0003xX-1U for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PauBD-0006dh-Cn for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PauBD-0006cz-4a for qemu-devel@nongnu.org; Thu, 06 Jan 2011 13:03:19 -0500 From: Marcelo Tosatti Date: Thu, 6 Jan 2011 15:56:11 -0200 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 05/35] Add function for checking mca broadcast of CPU List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Jin Dongming From: Jin Dongming Add function for checking whether current CPU support mca broadcast. Signed-off-by: Jin Dongming Signed-off-by: Marcelo Tosatti --- target-i386/cpu.h | 1 + target-i386/helper.c | 33 +++++++++++++++++++++++++++++++++ target-i386/kvm.c | 6 +----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index f0c07cd..dddcd74 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -760,6 +760,7 @@ int cpu_x86_exec(CPUX86State *s); void cpu_x86_close(CPUX86State *s); void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg); void x86_cpudef_setup(void); +int cpu_x86_support_mca_broadcast(CPUState *env); int cpu_get_pic_interrupt(CPUX86State *s); /* MSDOS compatibility mode FPU exception support */ diff --git a/target-i386/helper.c b/target-i386/helper.c index 2cfb4a4..6dfa27d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -110,6 +110,32 @@ void cpu_x86_close(CPUX86State *env) qemu_free(env); } +static void cpu_x86_version(CPUState *env, int *family, int *model) +{ + int cpuver = env->cpuid_version; + + if (family == NULL || model == NULL) { + return; + } + + *family = (cpuver >> 8) & 0x0f; + *model = ((cpuver >> 12) & 0xf0) + ((cpuver >> 4) & 0x0f); +} + +/* Broadcast MCA signal for processor version 06H_EH and above */ +int cpu_x86_support_mca_broadcast(CPUState *env) +{ + int family = 0; + int model = 0; + + cpu_x86_version(env, &family, &model); + if ((family == 6 && model >= 14) || family > 6) { + return 1; + } + + return 0; +} + /***********************************************************/ /* x86 debug */ @@ -1080,6 +1106,13 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, return; } + if (broadcast) { + if (!cpu_x86_support_mca_broadcast(cenv)) { + fprintf(stderr, "Current CPU does not support broadcast\n"); + return; + } + } + if (kvm_enabled()) { if (broadcast) { flag |= MCE_BROADCAST; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8b868ad..2115a58 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1711,13 +1711,9 @@ static void hardware_memory_error(void) static void kvm_mce_broadcast_rest(CPUState *env) { CPUState *cenv; - int family, model, cpuver = env->cpuid_version; - - family = (cpuver >> 8) & 0xf; - model = ((cpuver >> 12) & 0xf0) + ((cpuver >> 4) & 0xf); /* Broadcast MCA signal for processor version 06H_EH and above */ - if ((family == 6 && model >= 14) || family > 6) { + if (cpu_x86_support_mca_broadcast(env)) { for (cenv = first_cpu; cenv != NULL; cenv = cenv->next_cpu) { if (cenv == env) { continue; -- 1.7.2.3