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 27530C43334 for ; Thu, 7 Jul 2022 18:14:51 +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=BIGGIPgypqeCXSn6DwpMAmlpVXfIJQwL2lD4BV6jDJg=; b=ENRHH/y3iPPK93 IjfOzVgJWmP8KLHoCt349mDmS+7ZJT7/x1FgRJfAf97Wt+jqWnFjOoX0IPPLBNsoaFhRyzCAwGKWD 4jvqYB9qT71LFVh+zNt/jPCz1PRDh2Tr3MycFsLKCvA39f1GRc6oIxtAgXQU5zNIp/gBUih0hhgMC VpiHKh6V3pgP7Q1pj3s+NKNmuHOF83uM4QOUDRc/UYMm7R89xX5OzBbZLO+Dagx6Bv0gVEo/FlaFc p8TyBLyJbl0PEAfwWF9e53dd5KqqBzRnYMOavSBNCnmJIhEhNDUoHNMhEDGZ67FjZ1RrmV8hE5nvC ACVy6SyyejzhKNICzyBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9W0h-00HKPe-IJ; Thu, 07 Jul 2022 18:13:55 +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 1o9VzU-00HJam-MO for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 18:12:42 +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 3D72C6216A; Thu, 7 Jul 2022 18:12:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B94AC341CA; Thu, 7 Jul 2022 18:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657217559; bh=RRU0CyoS4I3/hvPhhZuu8xZ+nSGtXoEnL5agunx/Mvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eqpVKxvbkn42/L3eDbmFT3OfC7pUNdTSPy2WH6UMeTCCdilK7fzuW3Le4J51eqVlw TyuYMfooEDnJKqkefBe2DefOPejTCk4yd+ZAwU2p22KBQJGzJelCKU5bcrYyE0lqE9 Kl8fNK7MGBAWQLVeSj4DfgFdkcKZmjVKfKvLThKDWzjo/YMaSpIu7OHmWn6G35vdTm 19QNGLYNv5qaOtDnT8DopIYvL4tLFAErdjxLX8VgYkZva+vY2nplbOM2kdzl/OT2iz y25SYFjhCQqwoP19z6eU+cmt+x78OwptSJtrzflg1T9+qm61De04Kxn5ITijtCkimb nk9wcD214o12w== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 7/9] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 SME enumeration Date: Thu, 7 Jul 2022 19:12:18 +0100 Message-Id: <20220707181220.3373540-8-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=2459; h=from:subject; bh=RRU0CyoS4I3/hvPhhZuu8xZ+nSGtXoEnL5agunx/Mvc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBixyICt9Cz73tnO2mK4rgOSjSyKuGML/j41qJzIoD5 HWLdMwuJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsciAgAKCRAk1otyXVSH0FdEB/ 9Xp0Vv1KDKlUVizOjKt+/q0t/jidoh2DbcyPsRRJrYUKCxvzV0SDpNoLFtOIZSaWKY2e3jlqX9s4wE XSdljkEHI2MY4dURM0Iv7deMi0sHdQifxieN/uMqlrvYONemURaf4/HL/H9lY4dWPEIWOk1weqz+T0 vGBlhq1YnkIX6D6ne31UT+GNZ6Nhe1zUoSBMAimLNXCNb4BwgttgtJyV8Yhf7rPHszKzJ0fVOKQtE7 U38Bn5wqISJAKF22v7u9fyvRTytHT+Vb/qX2vwMIrioXdr0VvRZjQE47KwPJVL6V16cWTJzQkrD6f8 yYP00/NnHuvgX7rm+eKULzG7RTWK66 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_111240_874512_C1C87819 X-CRM114-Status: GOOD ( 14.48 ) 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 SME 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 4cf7e31aeebf..1c7e816879aa 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -725,7 +725,7 @@ #define ID_AA64PFR1_EL1_SSBS_IMP 1 #define ID_AA64PFR1_EL1_SSBS_SSBS2 2 #define ID_AA64PFR1_EL1_BT_IMP 0x1 -#define ID_AA64PFR1_EL1_SME 1 +#define ID_AA64PFR1_EL1_SME_IMP 1 #define ID_AA64PFR1_EL1_MTE_NI 0x0 #define ID_AA64PFR1_EL1_MTE_IMP 0x1 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index bc00b2a1a770..591664da7b89 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2552,7 +2552,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .sign = FTR_UNSIGNED, .field_pos = ID_AA64PFR1_EL1_SME_SHIFT, .field_width = 4, - .min_field_value = ID_AA64PFR1_EL1_SME, + .min_field_value = ID_AA64PFR1_EL1_SME_IMP, .matches = has_cpuid_feature, .cpu_enable = sme_kernel_enable, }, @@ -2728,7 +2728,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_CAP(SYS_ID_AA64ISAR2_EL1, ID_AA64ISAR2_EL1_RPRES_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_RPRES), HWCAP_CAP(SYS_ID_AA64ISAR2_EL1, ID_AA64ISAR2_EL1_WFxT_SHIFT, 4, FTR_UNSIGNED, ID_AA64ISAR2_EL1_WFxT_IMP, CAP_HWCAP, KERNEL_HWCAP_WFXT), #ifdef CONFIG_ARM64_SME - HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_SME_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_SME, CAP_HWCAP, KERNEL_HWCAP_SME), + HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_SME_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_SME_IMP, CAP_HWCAP, KERNEL_HWCAP_SME), HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_FA64_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_FA64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_FA64), HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_I16I64_SHIFT, 4, FTR_UNSIGNED, ID_AA64SMFR0_EL1_I16I64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_I16I64), HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_F64F64_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_F64F64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_F64F64), -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel