From patchwork Wed Mar 28 10:36:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZhenweiPi X-Patchwork-Id: 10312749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17C3F60467 for ; Wed, 28 Mar 2018 10:39:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B3A428CEB for ; Wed, 28 Mar 2018 10:39:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FD1C29A63; Wed, 28 Mar 2018 10:39:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1956F28CEB for ; Wed, 28 Mar 2018 10:39:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752863AbeC1KjD (ORCPT ); Wed, 28 Mar 2018 06:39:03 -0400 Received: from out3140-158.mail.aliyun.com ([42.120.140.158]:13289 "EHLO out3140-158.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752067AbeC1KjC (ORCPT ); Wed, 28 Mar 2018 06:39:02 -0400 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.2636044|-1; CH=green; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03299; MF=zhenwei.pi@youruncloud.com; NM=1; PH=DS; RN=14; RT=14; SR=0; TI=SMTPD_---.BTkE1-4_1522233527; Received: from localhost.localdomain(mailfrom:zhenwei.pi@youruncloud.com fp:112.95.153.98) by smtp.aliyun-inc.com(10.147.41.199); Wed, 28 Mar 2018 18:38:48 +0800 From: "zhenwei.pi" To: pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, thomas.lendacky@amd.com, bp@suse.de, gregkh@linuxfoundation.org, brijesh.singh@amd.com, len.brown@intel.com, dwmw@amazon.co.uk Cc: x86@kernel.org, kvm@vger.kernel.org, "zhenwei.pi" Subject: [PATCH] KVM: x86: remove double definitions of msr tsc deadline Date: Wed, 28 Mar 2018 18:36:45 +0800 Message-Id: <1522233405-6221-1-git-send-email-zhenwei.pi@youruncloud.com> X-Mailer: git-send-email 2.7.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Both MSR_IA32_TSCDEADLINE and MSR_IA32_TSC_DEADLINE define 0x000006e0. Intel SDM uses MSR_IA32_TSC_DEADLINE, so remove MSR_IA32_TSCDEADLINE. Signed-off-by: zhenwei.pi --- arch/x86/include/asm/msr-index.h | 2 -- arch/x86/kvm/x86.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index c9084de..fac31d1 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -463,8 +463,6 @@ #define MSR_IA32_APICBASE_ENABLE (1<<11) #define MSR_IA32_APICBASE_BASE (0xfffff<<12) -#define MSR_IA32_TSCDEADLINE 0x000006e0 - #define MSR_IA32_UCODE_WRITE 0x00000079 #define MSR_IA32_UCODE_REV 0x0000008b diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 18b5ca7..01540dd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1036,7 +1036,7 @@ static u32 emulated_msrs[] = { MSR_KVM_PV_EOI_EN, MSR_IA32_TSC_ADJUST, - MSR_IA32_TSCDEADLINE, + MSR_IA32_TSC_DEADLINE, MSR_IA32_MISC_ENABLE, MSR_IA32_MCG_STATUS, MSR_IA32_MCG_CTL, @@ -2310,7 +2310,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) return kvm_set_apic_base(vcpu, msr_info); case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: return kvm_x2apic_msr_write(vcpu, msr, data); - case MSR_IA32_TSCDEADLINE: + case MSR_IA32_TSC_DEADLINE: kvm_set_lapic_tscdeadline_msr(vcpu, data); break; case MSR_IA32_TSC_ADJUST: @@ -2595,7 +2595,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: return kvm_x2apic_msr_read(vcpu, msr_info->index, &msr_info->data); break; - case MSR_IA32_TSCDEADLINE: + case MSR_IA32_TSC_DEADLINE: msr_info->data = kvm_get_lapic_tscdeadline_msr(vcpu); break; case MSR_IA32_TSC_ADJUST: