From patchwork Mon Nov 20 12:37:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13461189 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 43A82C54FB9 for ; Mon, 20 Nov 2023 12:40:08 +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=dCeDbO6TwC02+P1+RkzTP6ALlmyG4vJ6ybWoTsWLZ2A=; b=4NefIIstUI8M59 m72uUorR7PZQ9W0be0IkZs0BN9cAXrIc6VXu5PAYr6B8EdI+ZAp/tUywUbqOYXo6O3fHsdK9AcmX8 u9Cu0UWdZQ787gBNYKu9F4+MthRypAg0TkPMvKQLYp7kfc7HSC+1OqJPvSuzBsTi75hpYt4AjJJ+n HIIc+XzYyWJ6lhMC6ygpnZuxyqwbk2UOoUBvx80KONPZLef/AYcT425ut6B2jn1qTNyv4dYKNC37P d1CcGTwHxATG4UUPknfeYisr2blUka+niE7zD9Q5d4Uc9gTiK74KgkqzNI1AeiAeU4SdQh3x/P1OD bc4d7Hc1mnADCge8Mnzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r53Yx-00C1Mh-34; Mon, 20 Nov 2023 12:39:40 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r53XB-00C0yK-2u for linux-arm-kernel@lists.infradead.org; Mon, 20 Nov 2023 12:37:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 43FB761248; Mon, 20 Nov 2023 12:37:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 322E2C4163D; Mon, 20 Nov 2023 12:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700483868; bh=WhHzN5W2I/wpV1unvPuXPKLCNSFax8QDUQeeKfUM8/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o+1/dbKeA6MPXeGvvDnjkKhYyNMHmYeEBbEaWsJ9GWViXxQAPfmZMb6dGyJijaGQZ D+kl4+O2DHnkX9cd7W/tZXjnDyEPH9toElC3D02i8aapwulW7Z7r29ALrfMhc+yRDh ersbWu3mjIgJ3gwW8KgoDbb1AjL8SYOaSZa5bPmsIv9mQuT+0JKXjc0VwwEiUFsXkU dlcPl+Jgw45ksv7BydrosEfhJqiVjkfFwojwApwMyRgmhBqwpuq+w6ynA/Nei2h55V b0onVtJxY997dafrdNCsIKvgNGmVTA85OGoPrFChly2noY8vCQPtn4af85KvgMeLaf dA7ZnKrS6BLGA== 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 1r53X8-00EjJv-D2; Mon, 20 Nov 2023 12:37:46 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Cc: Catalin Marinas , Will Deacon , Mark Rutland , Ard Biesheuvel , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH v2 12/13] KVM: arm64: Expose ID_AA64MMFR4_EL1 to guests Date: Mon, 20 Nov 2023 12:37:20 +0000 Message-Id: <20231120123721.851738-13-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120123721.851738-1-maz@kernel.org> References: <20231120123721.851738-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, ardb@kernel.org, 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-20231120_043750_170413_ECD08EA4 X-CRM114-Status: GOOD ( 11.87 ) 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 Reviewed-by: Suzuki K Poulose --- 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 9f76f24b96f8..ff2e66f0bda1 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2197,7 +2197,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),