From patchwork Tue Jul 18 16:58:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108141 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6148128obm; Tue, 18 Jul 2017 09:59:44 -0700 (PDT) X-Received: by 10.98.73.205 with SMTP id r74mr2684777pfi.166.1500397184620; Tue, 18 Jul 2017 09:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397184; cv=none; d=google.com; s=arc-20160816; b=vs5PtAvaWeCGk1rwlxdnKsMicVXH2yRAaZCcfcaBY8YYkmI5blWf2jNvrxZ7MconJR SZ1RZDOogadMUCSppQhvfiZ2xF9dytB6TgzXMFune/1GIBYpDtN7hMlTySVfLWLOyuYT w0aQBUoiQ3z5rayz5J8fItvgWA2n4WfeEU1crIvWWqX0OuhtS1FvxanugxGbfU7aTUpn X0iOq9gpDBf7xdTk+fL0/3OYTJ8ohFJZKTHxB+PBX69X/3F8UKW8IoBOiYxsaSxfJFr5 8EibFhRgoJY3qXKdJwaVl5gpruMQJuPZKo5MwGSs0VTRQm45m6RgU2lqnv5bAulXRCoZ 7Tgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=T0v9utudyF81U6j+p85lLGe3ajEusd68NHDmkB9JO6g=; b=o97M76m0FzOcjbK1t1h8Iw1BWx60QQv4EzK0Vw6LJEJG7xtjpFtuUVhSKkMpACDU4t 1QCBjtSxkKfEbHaW/RdUVW8M8fWw35XX0GWC/eeMVQOUTMRmrW3qGSTCIVsRcfVU2Wsb AmsZhhtsBP4HfSoFfPIEkDsNYHmRMHcjYPQm8oMhfznQ338R3RpD6Op6ZRnGUuflvvTk bvVPbCCVKgRLBLRiPuFIO8dTat8V590KfeAtc5OdEEYs44SGkQwZiF2OI1LzDWca19xg Dk6csTo+qI/7gQ5hUAuCnLoMIoMGc13MWz/mkS1IMadHNqyR1EXNaCfRm7F28mWf0LK+ gzAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=fiRQYEdg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m17si2157454pge.71.2017.07.18.09.59.44; Tue, 18 Jul 2017 09:59:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=fiRQYEdg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751824AbdGRQ7j (ORCPT + 25 others); Tue, 18 Jul 2017 12:59:39 -0400 Received: from mail-it0-f46.google.com ([209.85.214.46]:38034 "EHLO mail-it0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbdGRQ7g (ORCPT ); Tue, 18 Jul 2017 12:59:36 -0400 Received: by mail-it0-f46.google.com with SMTP id h199so16515824ith.1 for ; Tue, 18 Jul 2017 09:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T0v9utudyF81U6j+p85lLGe3ajEusd68NHDmkB9JO6g=; b=fiRQYEdgocQaqisVGAAxv20lAHwVNOf08vMV4RP0FVm2f3SH/suTDyIRrYRiaVIoPY cCC6ZUqZkwxhijwLnhDm/5Pd89ZauwRJAt3nZ07HCSA8Is96PPTRX80lHYmBviTNlbLz WkE4F1xEVD5fbU5+vI3+HQ3z3+1TsaiuwNIhQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T0v9utudyF81U6j+p85lLGe3ajEusd68NHDmkB9JO6g=; b=oqmRLTCPZg/UoQmlVZoBUQvx8y1hNfdgeAJjy/ulHQMeJ5TH/Jyegs1DeJnMqkkIzw f5uUYJXoMdEwHoNh21rzcw3GO4JLLXVZ38LCUE1493WlfAML0KL4O+wWFA3y8y1PBJVb t9U6D9HcM5HizsCBy1UG0Rgr3p/ns4lVDC9e85a7wFwlmfqL0YlzJrKYY9EChwxmpC3k AryYw0YdSXYbQJrxG8FMJw7qMPWm7KJNigE8Wy0cCZm6nswtXYl1AQeiVzEAFaoUS9w4 6SS+bc/wKsRWglUS1dyTzwntbQdrYCrjDIPNzR9uOIpFblKgqhoNfs+JNsAaUPO1zAyy uNuQ== X-Gm-Message-State: AIVw110yFNaTcFG+U+K05j7FQ2D+SQdVisDIA6jdFh+rfGsQdaEXJxGx 0743Qn72D0Kh7kGM X-Received: by 10.36.16.144 with SMTP id 138mr3744466ity.64.1500397175871; Tue, 18 Jul 2017 09:59:35 -0700 (PDT) Received: from node.jintackl-qv26972.kvmarm-pg0.wisc.cloudlab.us (c220g1-030822.wisc.cloudlab.us. [128.104.222.82]) by smtp.gmail.com with ESMTPSA id j96sm1413075ioo.49.2017.07.18.09.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 09:59:35 -0700 (PDT) From: Jintack Lim To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: corbet@lwn.net, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org, mchehab@kernel.org, cov@codeaurora.org, daniel.lezcano@linaro.org, david.daney@cavium.com, mark.rutland@arm.com, suzuki.poulose@arm.com, stefan@hello-penguin.com, andy.gross@linaro.org, wcohen@redhat.com, ard.biesheuvel@linaro.org, shankerd@codeaurora.org, vladimir.murzin@arm.com, james.morse@arm.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jintack Lim Subject: [RFC PATCH v2 01/38] arm64: Add ARM64_HAS_NESTED_VIRT feature Date: Tue, 18 Jul 2017 11:58:27 -0500 Message-Id: <1500397144-16232-2-git-send-email-jintack.lim@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> References: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new ARM64_HAS_NESTED_VIRT feature to indicate that the CPU has the ARMv8.3 nested virtualization capability. This will be used to support nested virtualization in KVM. Signed-off-by: Jintack Lim --- arch/arm64/include/asm/cpucaps.h | 3 ++- arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/kernel/cpufeature.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 8d2272c..64df263 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -39,7 +39,8 @@ #define ARM64_WORKAROUND_QCOM_FALKOR_E1003 18 #define ARM64_WORKAROUND_858921 19 #define ARM64_WORKAROUND_CAVIUM_30115 20 +#define ARM64_HAS_NESTED_VIRT 21 -#define ARM64_NCAPS 21 +#define ARM64_NCAPS 22 #endif /* __ASM_CPUCAPS_H */ diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 16e44fa..737ca30 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -376,6 +376,7 @@ #define ID_AA64MMFR1_VMIDBITS_16 2 /* id_aa64mmfr2 */ +#define ID_AA64MMFR2_NV_SHIFT 24 #define ID_AA64MMFR2_LVA_SHIFT 16 #define ID_AA64MMFR2_IESB_SHIFT 12 #define ID_AA64MMFR2_LSM_SHIFT 8 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 94b8f7f..523f998 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -144,6 +144,7 @@ }; static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_NV_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LVA_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_IESB_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LSM_SHIFT, 4, 0), @@ -867,6 +868,16 @@ static bool has_no_fpsimd(const struct arm64_cpu_capabilities *entry, int __unus .min_field_value = 0, .matches = has_no_fpsimd, }, + { + .desc = "Nested Virtualization Support", + .capability = ARM64_HAS_NESTED_VIRT, + .def_scope = SCOPE_SYSTEM, + .matches = has_cpuid_feature, + .sys_reg = SYS_ID_AA64MMFR2_EL1, + .sign = FTR_UNSIGNED, + .field_pos = ID_AA64MMFR2_NV_SHIFT, + .min_field_value = 1, + }, {}, };