From mboxrd@z Thu Jan 1 00:00:00 1970 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 2534DC00140 for ; Thu, 18 Aug 2022 12:45:13 +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=KRyy07CUbb/3U3pcP029zrDm+esCUpoCqJbvadmXESU=; b=o7VaR57VXjUNVT JOzUVX4Q3uEc0gvDRnP4Yk3rll00qSZT9pu1lB4V7Jpa5PtP3d0iS3kmoVlRsqnNQpCAMh/qDMaAR N50GD5k1tOoOjs+0hPFpDQmYG8guMFVoejdL4vW35tpMyHu4s65AznUwP5WJUwrNLNVS9EA/bLSnf XE7w/15Abxc9gmC+jaIPXtS8JCgGl43yIfc/BsClzd23lt1gBHN/CajXacxNlJhIfM3VQVH2b54Ft g7zPpxPyzq+Xb4EF22Kgb5Dwpgc9r80f+XcSdl9DuHs7pY1kbLRzkH0H37DwgV7ZSwdgFfldiNNTm 8f/ulyZe2AANnCqEXDHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOesI-004lGU-U4; Thu, 18 Aug 2022 12:43:52 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOedm-004ZsU-S3 for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:28:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4FE526158F; Thu, 18 Aug 2022 12:28:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 463C4C433C1; Thu, 18 Aug 2022 12:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825729; bh=G2oVxCiI0O9ort/8DHdBkis10pNkjDsn0nJx8gO2RaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u59uvZmCZOkWIPbI5+ocb8vgcGj6Vu1fp7DHMUKRpT78ycFtREtdCh7oxkZ3Q07aS 1JFxf/BKqrZUKqtqTFcTs3h82zeathbvliRRoWcNJhCCB7aVHRei0lt5jhpbnApfx/ hNFu9D1dMrnEvds7XVn4e+UnMrW9NuJcfcfLLw3toQtM3Y0bpIP2TGhClOoJg+aTWd INGGqi8j1DoPwRjTrV6c7rsnOsuKVgxgBg6I6+Yx4BIzxu7emBF+qKDIdMcUHtGr7N f4VTEknJdiT8HtS4NYqTHNFMmXSZPRsgyWuvS04kyXc7ruBIGL1eaa6uFV0V1IjusJ h3zqSTbzDg8ZQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 18/28] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 BTI enumeration Date: Thu, 18 Aug 2022 13:24:15 +0100 Message-Id: <20220818122425.37889-19-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220818122425.37889-1-broonie@kernel.org> References: <20220818122425.37889-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2002; i=broonie@kernel.org; h=from:subject; bh=G2oVxCiI0O9ort/8DHdBkis10pNkjDsn0nJx8gO2RaY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9vdMldeVlADApOqeT6LX2uVmNTljOJzjXweRW8 waw+7OaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vbwAKCRAk1otyXVSH0EKBB/ 94ya6grNQA0jCSf5GxBV+0rJ3JOKE08cJXtV9z0voqC6Z0E1Tf/y3NfNvJiHXFBl5w25oPhi1YCN1L JDW0u3Y1EZQ6T/I+SRjByNCE48nUrtaPrrooAN7Ls/+vPoXXO0YznohWUNACnZvjTKFsEJT9ZobM3r 3VKpaeXKo1tMdonJAVoVEubPvSK0yMvAoCMo4uSL2+duSqYZC1/QykI2jP/3V3T3VLhfgc7uXC+ExK jeqhCDIUv3S7swY5ezSV9zMhrkB1d9scczZ8vRKQC2ZOlrT2CIUcCcdU+eVyYVLpdt7a83C90qt7FJ qMENv+Qpe82joKIF3qGROUXQkU08fl X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_052851_086736_0D8D0E7D X-CRM114-Status: GOOD ( 14.55 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for automatic generation of constants update the define for BTI being implemented to the convention we are using, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/kernel/cpufeature.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 4ed5bedd43d5..700a33204fd5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -723,7 +723,7 @@ #define ID_AA64PFR1_EL1_SSBS_NI 0 #define ID_AA64PFR1_EL1_SSBS_IMP 1 #define ID_AA64PFR1_EL1_SSBS_SSBS2 2 -#define ID_AA64PFR1_EL1_BT_BTI 0x1 +#define ID_AA64PFR1_EL1_BT_IMP 0x1 #define ID_AA64PFR1_EL1_SME 1 #define ID_AA64PFR1_EL1_MTE_NI 0x0 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 9f022ba949fe..1dde62489389 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2527,7 +2527,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .sys_reg = SYS_ID_AA64PFR1_EL1, .field_pos = ID_AA64PFR1_EL1_BT_SHIFT, .field_width = 4, - .min_field_value = ID_AA64PFR1_EL1_BT_BTI, + .min_field_value = ID_AA64PFR1_EL1_BT_IMP, .sign = FTR_UNSIGNED, }, #endif @@ -2738,7 +2738,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { #endif HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_SSBS_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_SSBS_SSBS2, CAP_HWCAP, KERNEL_HWCAP_SSBS), #ifdef CONFIG_ARM64_BTI - HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_BT_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_BT_BTI, CAP_HWCAP, KERNEL_HWCAP_BTI), + HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_BT_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_BT_IMP, CAP_HWCAP, KERNEL_HWCAP_BTI), #endif #ifdef CONFIG_ARM64_PTR_AUTH HWCAP_MULTI_CAP(ptr_auth_hwcap_addr_matches, CAP_HWCAP, KERNEL_HWCAP_PACA), -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel