From patchwork Mon Nov 13 17:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13454266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77FBBC4332F for ; Mon, 13 Nov 2023 17:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xm00nb+ThAQBp9FDQgZuIFZSrawJ1MU88fOomdsKEzA=; b=Rv+e3wsI1E8la4 G2Fsk7GW7tJedRSDL5+1HcZz4x7wEp1ri7uP6syUzx7mP51MvdfBRi8chjsTCCY56SnGeehUIicxm Ohvf6od7lgrWo6CMdggJiJyowRGsSyQVK+6L3vxW6zW0UW7KaaDXO3v0uTKIUCrn56q4A3FwxVOAI Sc45LU/XhVwel3C11zLTse3VvWdvH3R63VzVHXnLVSX2l2ItmDd0oVwIODBNznTa2lhYfeNxeJjTQ 4MaHQP+U2FpkDOm0/wya4KxrzxAOY4SutCL2bJmffkPmVQk/XwyDTAA3/h5/rI4LxukDOMo7fBSmW DxyxbjFPtHys/SZmgB5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r2ayf-00EQBh-0G; Mon, 13 Nov 2023 17:44:01 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r2ayR-00EQ1d-3D for linux-arm-kernel@lists.infradead.org; Mon, 13 Nov 2023 17:43:51 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 1F5F460FBA; Mon, 13 Nov 2023 17:43:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1B74C433C7; Mon, 13 Nov 2023 17:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699897425; bh=iYlqs1RSget5iyc3jLMZO8ZKcFfCoTNJB6oiIZEmnlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sUYdit1b4tpTDNnPVOi4P7SB5TkMxqhC3p4iCoEeJ7W3CYufhLU5PqpaKKj/mCJCX XJ8F766xc/w72AJLh16CHjRzA3TCF3hEhgDCeU88/muLlQegOCBmwDyT02P9ocDwTe 3Bjhk3jugVM0CM6c37U0JMHFMrrgDSV9K//9h1ZZ68k5qj6N+5ez/q8KA8K//OWf62 h52Y7pe72gqZGMmA0sfem26teO/biGQEYUsNvTwM2GnWwyM22zgOXhSjKZY6RmD22w k8nAvVxgf0lSqyADZ8vDhiVN6LOecaapP5ZoxthrbJYpEmRxg2ORpay4LV6t4W5xjy aYZKMCUXYbXbQ== 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 1r2ayN-00CkQ4-Ue; Mon, 13 Nov 2023 17:43:44 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Cc: Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH 11/12] KVM: arm64: Expose ID_AA64MMFR4_EL1 to guests Date: Mon, 13 Nov 2023 17:42:43 +0000 Message-Id: <20231113174244.3026520-12-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231113174244.3026520-1-maz@kernel.org> References: <20231113174244.3026520-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231113_094348_088168_EF2EFED4 X-CRM114-Status: GOOD ( 11.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We can now expose ID_AA64MMFR4_EL1 to guests, and let NV guests understand that they cannot really switch HCR_EL2.E2H to 0 on some platforms. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 4 ++++ arch/arm64/kvm/sys_regs.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 042695a210ce..3885f1c93979 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -137,6 +137,10 @@ void access_nested_id_reg(struct kvm_vcpu *v, struct sys_reg_params *p, val |= FIELD_PREP(NV_FTR(MMFR2, TTL), 0b0001); break; + case SYS_ID_AA64MMFR4_EL1: + val &= NV_FTR(MMFR4, E2H0); + break; + case SYS_ID_AA64DFR0_EL1: /* Only limited support for PMU, Debug, BPs and WPs */ val &= (NV_FTR(DFR0, PMUVer) | diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 4735e1b37fb3..4461eafca16c 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2196,7 +2196,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { ID_AA64MMFR2_EL1_NV | ID_AA64MMFR2_EL1_CCIDX)), ID_SANITISED(ID_AA64MMFR3_EL1), - ID_UNALLOCATED(7,4), + ID_SANITISED(ID_AA64MMFR4_EL1), ID_UNALLOCATED(7,5), ID_UNALLOCATED(7,6), ID_UNALLOCATED(7,7),