From patchwork Fri Jul 13 18:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 1196531 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 08886DFFFD for ; Fri, 13 Jul 2012 18:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030780Ab2GMSEB (ORCPT ); Fri, 13 Jul 2012 14:04:01 -0400 Received: from hapkido.dreamhost.com ([66.33.216.122]:39207 "EHLO hapkido.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932563Ab2GMSEA (ORCPT ); Fri, 13 Jul 2012 14:04:00 -0400 Received: from homiemail-a3.g.dreamhost.com (caiajhbdcbhh.dreamhost.com [208.97.132.177]) by hapkido.dreamhost.com (Postfix) with ESMTP id 91B51CC0; Fri, 13 Jul 2012 11:03:59 -0700 (PDT) Received: from homiemail-a3.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a3.g.dreamhost.com (Postfix) with ESMTP id D5249284078; Fri, 13 Jul 2012 11:02:58 -0700 (PDT) Received: from [192.168.1.33] (145.Red-83-50-36.dynamicIP.rima-tde.net [83.50.36.145]) (Authenticated sender: smtp@zesaurus.cl) by homiemail-a3.g.dreamhost.com (Postfix) with ESMTPA id 3FF69284071; Fri, 13 Jul 2012 11:02:57 -0700 (PDT) Subject: [PATCH] x86, amd: rename vmmu support capability From: Davidlohr Bueso Reply-To: dave@gnu.org To: "H. Peter Anvin" , Ingo Molnar Cc: lkml , kvm list , x86@kernel.org Organization: GNU Date: Fri, 13 Jul 2012 20:02:55 +0200 Message-ID: <1342202575.2706.4.camel@offbook> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Davidlohr Bueso AMD has renamed nested page table technology to rapid virtualization indexing, reflect this change in the kernel. Signed-off-by: Davidlohr Bueso --- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/kernel/cpu/scattered.c | 2 +- arch/x86/kvm/svm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index f91e80f..a6fa778 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -185,7 +185,7 @@ #define X86_FEATURE_FLEXPRIORITY (8*32+ 2) /* Intel FlexPriority */ #define X86_FEATURE_EPT (8*32+ 3) /* Intel Extended Page Table */ #define X86_FEATURE_VPID (8*32+ 4) /* Intel Virtual Processor ID */ -#define X86_FEATURE_NPT (8*32+ 5) /* AMD Nested Page Table support */ +#define X86_FEATURE_RVI (8*32+ 5) /* AMD Rapid Virtualization Indexing support */ #define X86_FEATURE_LBRV (8*32+ 6) /* AMD LBR Virtualization support */ #define X86_FEATURE_SVML (8*32+ 7) /* "svm_lock" AMD SVM locking MSR */ #define X86_FEATURE_NRIPS (8*32+ 8) /* "nrip_save" AMD SVM next_rip save */ diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index ee8e9ab..78ec9e6 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -41,7 +41,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) { X86_FEATURE_XSAVEOPT, CR_EAX, 0, 0x0000000d, 1 }, { X86_FEATURE_CPB, CR_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_HW_PSTATE, CR_EDX, 7, 0x80000007, 0 }, - { X86_FEATURE_NPT, CR_EDX, 0, 0x8000000a, 0 }, + { X86_FEATURE_RVI, CR_EDX, 0, 0x8000000a, 0 }, { X86_FEATURE_LBRV, CR_EDX, 1, 0x8000000a, 0 }, { X86_FEATURE_SVML, CR_EDX, 2, 0x8000000a, 0 }, { X86_FEATURE_NRIPS, CR_EDX, 3, 0x8000000a, 0 }, diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index f75af40..6863898 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -900,7 +900,7 @@ static __init int svm_hardware_setup(void) goto err; } - if (!boot_cpu_has(X86_FEATURE_NPT)) + if (!boot_cpu_has(X86_FEATURE_RVI)) npt_enabled = false; if (npt_enabled && !npt) {