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 A65DCC32772 for ; Thu, 18 Aug 2022 12:46:23 +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=PVKjxKgy4qxUwM5jc69xJD53iElzb5qBywB9ypcm3rI=; b=QxhxXKq747jykT wQuvSEra2WS10d6+tXrZ38vizlJDI0YY91Ne5+uXFWQpViF8itFgee4l35ywVt+2I8oQM4ozllTmw FLAl373MQjmBqsXQrIG4PFpiaMCSM2cm/lMtyMrMmrHHG3KzLI5Q2lJr968gClnUTj+APWOoCPb1P liCtQPxzBwsiCSVvEW++AKpbMgr1TPz7dn2IEB9K87m+h4T5OwSz+suq9u6iQewsVi64DuZNn8P5k o/8BCn0CM5e9I0iSvfMNboxMgWOKxk/ZYX8Qb1NwV3/VxKOd059jqGAN0NPiQQCOxSOGCvEcSkmAi SLpM/EYe9ks6EXsGMbOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOetP-004mIo-A8; Thu, 18 Aug 2022 12:44:59 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOedq-004Ztj-2c for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:28:55 +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 ams.source.kernel.org (Postfix) with ESMTPS id D09C0B8216C; Thu, 18 Aug 2022 12:28:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DD1DC4347C; Thu, 18 Aug 2022 12:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825731; bh=CqTVBhBjoHxRN9eJAI2/wtpQ4q21UjZFUJQ1nwDF2c8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MSAADGdzCsXgqcBKyEdCVZ+m2yJKe/xMcWP6IJwRi5NXYo4eaVI9sDCvvnFBGYYri P9k5eur4yzpa6U0faxpcX+lClGCmY3IbV+z3dgT6WRL/6sAgGu0t5HV++OmFYFFDZm mnbhM6o6kCVEBW0kOOvZJAh4M9WQixnL/KNF3vKFxEb/T20VDbcQtMO/zBQw6jmMwn 8fAShQuWHV0335je2b7jL/37ufRvI3+IHt+Phumit9rM0MYBkxzfjaapLQthG08hX3 gvWtgMi2X7meAZkXaDFbfEy/C3foDgG4HsqgGnjiNIVUGdENYOliRAkahPOOythhnv tU+hVN3jEoQGA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 19/28] arm64/sysreg: Standardise naming of ID_AA64PFR1_EL1 SME enumeration Date: Thu, 18 Aug 2022 13:24:16 +0100 Message-Id: <20220818122425.37889-20-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=2459; i=broonie@kernel.org; h=from:subject; bh=CqTVBhBjoHxRN9eJAI2/wtpQ4q21UjZFUJQ1nwDF2c8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9vPR1rv72HOavvW2mxGEuFe3PANyelN5FCCjY2 xKYdBgGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vbwAKCRAk1otyXVSH0ATGB/ 4ug6LQ8qlhNhRZ0zfq60ZwK11df6lz98oLMbkS2RgKJiAGkTLUxaIFT1++ha1pKbjnF4RQqnBkxc3E qJsmHbiYCco1zclYjs3lN++Nokcv08UNP+79DFt8MzjTD2frvMakT7EfrDKNWnyZ+QrfgJ3/WFiNrJ W/TyhfyFGISz37ac3llX6lUmNgaB4IJl+7dImKGtjy5X0eGl4//ahl/hT+phmAcRlgo5WTKh4aDcEB gp7QEVAmpWY0BdTNmphHQThCD3dK6yfiYsR/tpr/EU8G5s2CnBCGoHOUFN8DEhUFklLWBkaNIzHVQz Kc2VJW8/P3x+LxGJdVl1sCTJFKF6jh 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_052854_437630_8A19E2E4 X-CRM114-Status: GOOD ( 14.37 ) 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 700a33204fd5..d3e1e58bb534 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -724,7 +724,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 1dde62489389..e6f9969c84bb 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2576,7 +2576,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, }, @@ -2753,7 +2753,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