Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44ED8101C7 for ; Tue, 8 Aug 2023 11:48:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BBE4C433C9; Tue, 8 Aug 2023 11:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691495292; bh=QjU09/ztCkP8Hqos+fcG049ytIrT3fHu8hzu5/go5vY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i6ic2czQLDOnwPazNfEK/3Epm4IXa2Mlpaif4VAuc/uwhHFF47JXlUDS7nsWrs86l sTpvI8Axf2SYzet+9noTnzxUgThstg4Z6Ky85Gb0OCvhjzFyX+MUhTgQf5/rhRsoO8 ZPN85G9y5BY7qYeUqu9Tx/2dR9H5XHQAHhgcPCIFaV9Jpgf8KN2r2ojAD1QNni5IGH ZpAJGPPsez3Jy4cFcbdc0kzwlTj1QImg66wfL9tQVbQWLdJchjhG2qC4p8APAIi4As ImsFo+aKADp8rvmk8uRP5hi5E18uPZyUSj9z5G6IYQmMiwJACovnfl5q6UTYNt1zTw sCG3gHZJkA9YA== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qTLBL-0037Ph-Dq; Tue, 08 Aug 2023 12:47:23 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Catalin Marinas , Eric Auger , Mark Brown , Mark Rutland , Will Deacon , Alexandru Elisei , Andre Przywara , Chase Conklin , Ganapatrao Kulkarni , Darren Hart , Miguel Luis , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH v3 25/27] KVM: arm64: nv: Expose FGT to nested guests Date: Tue, 8 Aug 2023 12:47:09 +0100 Message-Id: <20230808114711.2013842-26-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230808114711.2013842-1-maz@kernel.org> References: <20230808114711.2013842-1-maz@kernel.org> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, eric.auger@redhat.com, broonie@kernel.org, mark.rutland@arm.com, will@kernel.org, alexandru.elisei@arm.com, andre.przywara@arm.com, chase.conklin@arm.com, gankulkarni@os.amperecomputing.com, darren@os.amperecomputing.com, miguel.luis@oracle.com, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Now that we have FGT support, expose the feature to NV guests. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 7f80f385d9e8..3facd8918ae3 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -71,8 +71,9 @@ void access_nested_id_reg(struct kvm_vcpu *v, struct sys_reg_params *p, break; case SYS_ID_AA64MMFR0_EL1: - /* Hide ECV, FGT, ExS, Secure Memory */ - val &= ~(GENMASK_ULL(63, 43) | + /* Hide ECV, ExS, Secure Memory */ + val &= ~(NV_FTR(MMFR0, ECV) | + NV_FTR(MMFR0, EXS) | NV_FTR(MMFR0, TGRAN4_2) | NV_FTR(MMFR0, TGRAN16_2) | NV_FTR(MMFR0, TGRAN64_2) | -- 2.34.1