From mboxrd@z Thu Jan 1 00:00:00 1970 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 85AC11F759F; Tue, 3 Dec 2024 14:56:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733237776; cv=none; b=ZlesQjdWsX8c458bTbDoChjvb3DUV4aOWD4cjJmGWFEfdwZV//JkSFa0Zx7Qmv74hvifero2yu1sPOaVCdJlZ8Ap+M56izUcg6gHK9QF5NNbbWIO9ar8b09jcoq+nr94oLIVhU19H33EMJR2yJitHVk6uUV00dtQS3yESiSSvzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733237776; c=relaxed/simple; bh=qhawEOb2Rh6c98pHFzsINEN4z3KjTiCkHMWjGOBHbAk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UfREe/SB8BZayRLl+1KsCiZNT44E514pFvsavMfsjfSuqRb9+3TIrvUK0n2RECsc1uYg//1Jr4tJqY/RJdlQWrEp4Cp7FIo94Pi24emlrtP6skYl1Dtnn6mzgEiuWZw71CZwSDUcisJ3qxv8uXC2L4HwyYIiImPy95KCfE0VY9U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h2kxx2cL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="h2kxx2cL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91EFBC4CECF; Tue, 3 Dec 2024 14:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733237776; bh=qhawEOb2Rh6c98pHFzsINEN4z3KjTiCkHMWjGOBHbAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2kxx2cLEWSfXw8VD5KFYvtbA991ByrygSDHFLGwQoS26s0ZH2tJb4wcaqvUuGpli JSXs0giTr/EanyJbydD6zrKNOg+MY07Bgro4iOVVyHDO2E84U2W77nX5+dS34pdH7F ZME6662nRlrhM64lFU6sb+btae5dQPPng1y6E1+4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marc Zyngier , Catalin Marinas , Oliver Upton , Sasha Levin Subject: [PATCH 6.11 065/817] arm64: Expose ID_AA64ISAR1_EL1.XS to sanitised feature consumers Date: Tue, 3 Dec 2024 15:33:57 +0100 Message-ID: <20241203143958.226287151@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Zyngier [ Upstream commit 2287a4c1e11822d05a70d22f28b26bd810dd204e ] Despite KVM now being able to deal with XS-tagged TLBIs, we still don't expose these feature bits to KVM. Plumb in the feature in ID_AA64ISAR1_EL1. Fixes: 0feec7769a63 ("KVM: arm64: nv: Add handling of NXS-flavoured TLBI operations") Signed-off-by: Marc Zyngier Acked-by: Catalin Marinas Reviewed-by: Oliver Upton Link: https://lore.kernel.org/r/20241031083519.364313-1-maz@kernel.org Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/cpufeature.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 646ecd3069fdd..4901daace5a3e 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -228,6 +228,7 @@ static const struct arm64_ftr_bits ftr_id_aa64isar0[] = { }; static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_EL1_XS_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_EL1_I8MM_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_EL1_DGH_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_EL1_BF16_SHIFT, 4, 0), -- 2.43.0