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 B307010784 for ; Fri, 28 Jul 2023 08:47:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3612AC433C8; Fri, 28 Jul 2023 08:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690534030; bh=6d4Kspg7nIaOGmD/4cchuF/PX4zqa/gLnUY8Tbj4CBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kARfcDVFR+hyeh9MGYD7AEqXlz1kKaA2sQR+jYHNp2CvVWU2chvCGoZWiR2rrAqq0 YQ8tVWK1+1SfTDUBOHSW2G7tuh3vhqLkYLpRVeZ5/YPt28eYEdPP29b3LOCf0zrkZC uE+4QB3IQ+kHnsCn22J4UW9sijJ+UgrG/mWUl91+OAhiuVHlX15UtbvvqJPg3REOPe vf9Zgce/XX/awzzzwZCEraWoktsTmgLEroitseYR0+xiCPY7ZI29fL7GVvSI0qeDiI GBmkGj1fNZ4mbIGA5lRKbEVDF6GQraW2spCiqhjFHROrDcFbbVC7IrtEJq/H8sQ9Ux z+7cQJWJUyQ8Q== 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 1qPIrL-0000EO-II; Fri, 28 Jul 2023 09:30:03 +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 v2 16/26] KVM: arm64: nv: Expose FEAT_EVT to nested guests Date: Fri, 28 Jul 2023 09:29:42 +0100 Message-Id: <20230728082952.959212-17-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230728082952.959212-1-maz@kernel.org> References: <20230728082952.959212-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 properly implement FEAT_EVT (as we correctly forward traps), expose it to guests. Reviewed-by: Eric Auger Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 315354d27978..7f80f385d9e8 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -124,8 +124,7 @@ void access_nested_id_reg(struct kvm_vcpu *v, struct sys_reg_params *p, break; case SYS_ID_AA64MMFR2_EL1: - val &= ~(NV_FTR(MMFR2, EVT) | - NV_FTR(MMFR2, BBM) | + val &= ~(NV_FTR(MMFR2, BBM) | NV_FTR(MMFR2, TTL) | GENMASK_ULL(47, 44) | NV_FTR(MMFR2, ST) | -- 2.34.1