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 6FFD7C43334 for ; Thu, 7 Jul 2022 18:14:39 +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=9V/6ZQW+dEUENoe1zwR5HtOaPq/kKbibM6qsBx+f6u4=; b=vqD2vyGXEUn25O LrkHzP4iPvxt0l/eqUyrLt9LzfYqXSx9d7kPu1x8crAQ6pobQS6qx1DTtC0cCUjtSiXHa6PeykgDS wuuX7/AcbcuFcUG2qg972dmWl010PmXOt7aPAlvHDYQT1lr2Fhk8m+yfSNh2LgzuW8tUmHVxuCstC ebmqoBebQTKyZ4iGWiXPeeEqZrGpYr0S7pqRYXqVz5hqGE6k5iMusOJn3cWASqowGKVs879mgBSm6 eVaj+mUxn2ij2iNnXaqpeXjSjiEJBETXlIsKig95oVLnc8rj6tY4ln0lyha6kF+KaCEEREG2/dQ9V /y3XvziGB+nQs03i5vfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9W0S-00HKHH-I5; Thu, 07 Jul 2022 18:13:40 +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 1o9VzT-00HJZ4-8V for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 18:12:40 +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 97CAA621ED; Thu, 7 Jul 2022 18:12:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA86BC341C0; Thu, 7 Jul 2022 18:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657217558; bh=yJcxv82vF8VaTBXjbvTJvgMraWemFOYh5S1Ht8ZIesY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJIWdH2mu503D2Bu7LJevfO4k5l1aYNE/IPya1DJgAnh/0TqGc6k4lXhQJlkkXLv6 ZoUwcs1dQhnwD9rev1qwihOJhp29N/0VN4eeXFyIOL5Q2+CeWnNXKdlHr+o59uK5Up r0qqIC3ftkgRFkwc7RaQepV5wRc1KUXT6PKaM2wKEgX1psofitTwEE74tiftcRBr7f 6uUQ1/cO8TIIdkCfADLryLp+ZkiVWIRIPIXMoa7relSKZMJtT3sfyAenkHKCXN73xh yAlg0qpa7lomSZg0sGAiFYrrT3W7sFgkS7FkH7nAvJECIAeTWJLAf0ynXrpcEvGylJ tyOdngyZ5N+NQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 6/9] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 BTI enumeration Date: Thu, 7 Jul 2022 19:12:17 +0100 Message-Id: <20220707181220.3373540-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707181220.3373540-1-broonie@kernel.org> References: <20220707181220.3373540-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2002; h=from:subject; bh=yJcxv82vF8VaTBXjbvTJvgMraWemFOYh5S1Ht8ZIesY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBixyIBjsnHw0yQJbk8zgIOzQdrPwgiRqIwwx/mNkC2 M3fpHOqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsciAQAKCRAk1otyXVSH0LphB/ wJ0yeEbPlOEo22mjDJc5kUqvmh0Y/Rjv6iF7OjOssceSqrfRQmMuEH4XFotVU55fNgqqYgJnqy8DR4 +XG+UlgDa54fw67m5pUwsyjQiB1Uqn3OaRZzJCJlx3aca3Usvz/26hWdZLVb2uZsW/0gDM5YXUWdaQ GRck0KzG5A/9LNfCC352VxxCK32lFo5VqghxCzEqCyCWOWO85z/cjsIePd2TwyYMTUeSPdneqKmG9k TnbWtkQAZPtBsCS4I+KwYQ4DhaTgDiIS9NjJyGXraPPlsuC0uWIn0u2zd6KAe53R48Otsggs7TjQf7 TJHqwGy+PU1PQVyZkqDTUW+sV11iPk 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-20220707_111239_423375_11ED420C X-CRM114-Status: GOOD ( 14.66 ) 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 5527743b3f2b..4cf7e31aeebf 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -724,7 +724,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 2fef18e75475..bc00b2a1a770 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2503,7 +2503,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 @@ -2713,7 +2713,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