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 56C43C43334 for ; Thu, 7 Jul 2022 18:14:10 +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=/pK1eVVdu0+2FTFMTAvu8cX+06R8rSB0g7OfHRAo9ZM=; b=Q75+RmGynPVjNg VzIL146KEL2zAOAYdqfPNq+29IaoHNPSa57/Yh2Z2Cu2rnVg8+9jT+wo3cD2PiBrvu/obRZEfqPKK c81wRsK46dru7rGDL43lfPyy9Pb5JYPAKa6NDeAdUeUlJfnt1agHPCk4Vc1gMdX15SRXA8cu9c9ni uXgTq3FpEn2dfwd4Vnan+e4rBbRNCF7NB/C6C4gaOCBNaN6Z9oOUTGeEUt1jpFZUV2nG9m24hhSn/ oZdTy3Y/PuI+O4Mh2McOwpC+bGhbmvLVosxau4trIb9Nrl7sBUD3NnCxfPRdsmX/TnAoGSXbiH3WW 6IkBqkJbnZxH48teJC2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Vzz-00HJxB-Ap; Thu, 07 Jul 2022 18:13:11 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9VzP-00HJX5-Lw for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 18:12:37 +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 32C02621B7; Thu, 7 Jul 2022 18:12:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55497C341C8; Thu, 7 Jul 2022 18:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657217554; bh=fMJL4G2ohcm5pespc0c4DPOyS1A7aCA/vMCChw4zpfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WPHJ2B+y3BtFPExa2ASsCvKfw5KtBhOWxQYYsY5E+V95KrCdaxxmVCp8dgQpI3zE0 dMZ4yhOFDX4NY8DdspddlNUjpui5H393SNxALqQDIpKDUnGdJ9jVreFeZHVOEIM/Sp IetCwcTYuu8d77I4csyUWa+QiyAIKBjio6aKUfl1h+ziErjUgRzaonXbj8xUrNaLYP +BX9rJy/DpF9AERwE+mzxHLL3/6M4lIW+GWQi6H8HLu5fuxYxUTgGQ6LYJr+1CFbNm 3tGmJJ5Tg9w/khGTOCOQnHmzOOmYD2ANWJXeTPtlQWx3O8zamc+JzhmLn+mGh5SYt/ Nb9efQE38wKSg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 4/9] arm64/sysreg: Standardise naming for MTE feature enumeration Date: Thu, 7 Jul 2022 19:12:15 +0100 Message-Id: <20220707181220.3373540-5-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=3971; h=from:subject; bh=fMJL4G2ohcm5pespc0c4DPOyS1A7aCA/vMCChw4zpfQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBixyH/5EGbQR24RlU2JU4pe4LngoTcJRw/Pp5RQg7a qqPScB+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsch/wAKCRAk1otyXVSH0IHFB/ 4p4yPggVqvubkLB7KNTDmCOyRnQ4C5Cg1l09xqyz0MEA+VQ7tdiUIg573fpezP7jZP9M5/YsU+Y0aA E47KpeoYCE4hy93vZdXdDIXJ7a0LOsrqoG31lrgQlPZ1giHQKfl/RgAZhRj3ydntM+lO5GSzEjDLsH YNBGrHNr/W9pp2HwPEITJbzL9UdPvDJFo49Bc3vW2M53xR5fCbUMDAShf+Vp/SBhaSM6xtBoq78Mdg x+geY0pg+6riOAeH3Eh2M0cFT2ohmjgHTinyY6DMdoNicThyumtfwnTJwhdRlEt+do5nfKU+7hxDxv TxrJNGy+CWztazZ6UpHKLPJUoAqXph 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_111235_842541_97441D20 X-CRM114-Status: GOOD ( 15.29 ) 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 conversion to automatic generation refresh the names given to the items in the MTE feture enumeration to reflect our standard pattern for naming, corresponding to the architecture feature names they reflect. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/cpufeature.h | 2 +- arch/arm64/include/asm/sysreg.h | 6 +++--- arch/arm64/kernel/cpufeature.c | 8 ++++---- arch/arm64/mm/proc.S | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 98b5bce3a469..db6d1405d8d2 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -633,7 +633,7 @@ static inline bool id_aa64pfr1_mte(u64 pfr1) { u32 val = cpuid_feature_extract_unsigned_field(pfr1, ID_AA64PFR1_EL1_MTE_SHIFT); - return val >= ID_AA64PFR1_EL1_MTE; + return val >= ID_AA64PFR1_EL1_MTE_MTE2; } void __init setup_cpu_features(void); diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 88d01790127e..624659fd2acd 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -728,9 +728,9 @@ #define ID_AA64PFR1_EL1_SME 1 #define ID_AA64PFR1_EL1_MTE_NI 0x0 -#define ID_AA64PFR1_EL1_MTE_EL0 0x1 -#define ID_AA64PFR1_EL1_MTE 0x2 -#define ID_AA64PFR1_EL1_MTE_ASYMM 0x3 +#define ID_AA64PFR1_EL1_MTE_IMP 0x1 +#define ID_AA64PFR1_EL1_MTE_MTE2 0x2 +#define ID_AA64PFR1_EL1_MTE_MTE3 0x3 /* id_aa64mmfr0 */ #define ID_AA64MMFR0_ECV_SHIFT 60 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 7f9182f316ed..561df2540a58 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2516,7 +2516,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .sys_reg = SYS_ID_AA64PFR1_EL1, .field_pos = ID_AA64PFR1_EL1_MTE_SHIFT, .field_width = 4, - .min_field_value = ID_AA64PFR1_EL1_MTE, + .min_field_value = ID_AA64PFR1_EL1_MTE_MTE2, .sign = FTR_UNSIGNED, .cpu_enable = cpu_enable_mte, }, @@ -2528,7 +2528,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .sys_reg = SYS_ID_AA64PFR1_EL1, .field_pos = ID_AA64PFR1_EL1_MTE_SHIFT, .field_width = 4, - .min_field_value = ID_AA64PFR1_EL1_MTE_ASYMM, + .min_field_value = ID_AA64PFR1_EL1_MTE_MTE3, .sign = FTR_UNSIGNED, }, #endif /* CONFIG_ARM64_MTE */ @@ -2720,8 +2720,8 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_MULTI_CAP(ptr_auth_hwcap_gen_matches, CAP_HWCAP, KERNEL_HWCAP_PACG), #endif #ifdef CONFIG_ARM64_MTE - HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_MTE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_MTE, CAP_HWCAP, KERNEL_HWCAP_MTE), - HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_MTE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_MTE_ASYMM, CAP_HWCAP, KERNEL_HWCAP_MTE3), + HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_MTE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_MTE_MTE2, CAP_HWCAP, KERNEL_HWCAP_MTE), + HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_MTE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_MTE_MTE3, CAP_HWCAP, KERNEL_HWCAP_MTE3), #endif /* CONFIG_ARM64_MTE */ HWCAP_CAP(SYS_ID_AA64MMFR0_EL1, ID_AA64MMFR0_ECV_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ECV), HWCAP_CAP(SYS_ID_AA64MMFR1_EL1, ID_AA64MMFR1_AFP_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_AFP), diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 15539da36bc3..5f7784ee6044 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -435,7 +435,7 @@ SYM_FUNC_START(__cpu_setup) */ mrs x10, ID_AA64PFR1_EL1 ubfx x10, x10, #ID_AA64PFR1_EL1_MTE_SHIFT, #4 - cmp x10, #ID_AA64PFR1_EL1_MTE + cmp x10, #ID_AA64PFR1_EL1_MTE_MTE2 b.lt 1f /* Normal Tagged memory type at the corresponding MAIR index */ -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel