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 3E0A4C43334 for ; Thu, 7 Jul 2022 18:13:58 +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=p80WsUKFI5N25+PtwUzwUVsykoxTM2Y2RdWXzBhGGG4=; b=f8zi/pMHUgxQH5 opxzw4BTnqiDsvo6f2Y3zqMlLlMgCLAIeH7QgHKqdMYOn4/EjgQ4NJzfPOdq33/R3j7GJziVRDDFP 1N5KOAPwgI0udu/5FbBAAWNyfQkQiyI/GpTXB+QiEcHSF2vDGrK2YexkkymmNvDFmAtykew2diTjb dqdi/KMwDWFoNTmZiXVdD7rlkXpgQzz3kktJqcyop45NZ/YBGI3FYAgG7oyC++L5ubE0xKh8VjsAd m6lI6kqzvThweSRRzYYxi0clfBr6v2Jo+lGp6Oplpk68OVHn74gn+orHuZYF4I5X8c6wc1PokAKCO lpCpU+rZ5TNuW4qZwXKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Vzq-00HJrM-F9; Thu, 07 Jul 2022 18:13:02 +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 1o9VzN-00HJVz-Vp for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 18:12:35 +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 78E8B621EB; Thu, 7 Jul 2022 18:12:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4943C341C6; Thu, 7 Jul 2022 18:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657217552; bh=9QHu+3103BTkkxvFGQQDS93Zz/9wZiHF6B5uWLqrYiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JgVttPIolZiw+Sbj4eCF1wMJ+bRsl6SHAIkgEgNzI2kmpOuSXFUeOco6TscgVehnV OLrZ1rUzbBXHAHUqUU1DkIqQa96nbGh1od9i+YpbQ+q2BIvCCDWEo0M6WeD7YXjKkM adk0DXhgA8DPoJT+16k1t1N+DZdasHN/h8Irq4k+dnMxfEPfsy1XByaGx0zn646hqg vCHgraw3WkEJHSloHtX+An0qQ4zHfHcQ1ejVBqoONInXJOuyZedkCVbKHpITE/5LvP DG7qAmue8ge/XH1HC+fIDRQG/Qof1q5u8MrNeioWllR+Wu6qCGq2ipZMJaQ9Hu6Nbv LneXr3rHg1ESQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 3/9] arm64/sysreg: Standardise naming for SSBS feature enumeration Date: Thu, 7 Jul 2022 19:12:14 +0100 Message-Id: <20220707181220.3373540-4-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=3322; h=from:subject; bh=9QHu+3103BTkkxvFGQQDS93Zz/9wZiHF6B5uWLqrYiE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBixyH/70dvo8X5LBq6kuGoVPE/tJz8weQhjXGDqhR6 US0teiaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsch/wAKCRAk1otyXVSH0DTdB/ wOfQ+7KWczUjbKKBK+2HTLHM4hUeqCibcEkvhPZYwlj+lexQ2EZKtzt7mMnwlKA/0QqYvN9YemVwq7 ky9CHzVCUn12a+tiaKA4Zx4ShJHTsPy3RAleHvyVuZ3u6nrlaHpkDI4P9gFsOmIl08Tt0X4k5yv/4g foG+WcM6/il2DTJFUrW6I7ZtibAxTVAm1rmXMKv3w8aL/eALxR+xTFqT2e8Rk3Ecn8l4gw2MkakLie iMLoHUKaxRCrwaSjaWAMNh7p1WL1hitytufmRbzCR3UREMgTBxlm8Cc2WFWIRUb7ig8rA5+r4vm+Hr xSCo/BQRIQUFe0TMEYcIaZiqos+uaI 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_111234_134515_BF9EE9AB X-CRM114-Status: GOOD ( 13.75 ) 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 SSBS feature 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/sysreg.h | 10 +++++----- arch/arm64/kernel/cpufeature.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index a361b671f755..88d01790127e 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -721,11 +721,11 @@ #define ID_AA64PFR1_EL1_SSBS_SHIFT 4 #define ID_AA64PFR1_EL1_BT_SHIFT 0 -#define ID_AA64PFR1_EL1_SSBS_PSTATE_NI 0 -#define ID_AA64PFR1_EL1_SSBS_PSTATE_ONLY 1 -#define ID_AA64PFR1_EL1_SSBS_PSTATE_INSNS 2 -#define ID_AA64PFR1_EL1_BT_BTI 0x1 -#define ID_AA64PFR1_EL1_SME 1 +#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_SME 1 #define ID_AA64PFR1_EL1_MTE_NI 0x0 #define ID_AA64PFR1_EL1_MTE_EL0 0x1 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 7bccca17e353..7f9182f316ed 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -268,7 +268,7 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_RASFRAC_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_MTE), FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_MTE_SHIFT, 4, ID_AA64PFR1_EL1_MTE_NI), - ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_SSBS_SHIFT, 4, ID_AA64PFR1_EL1_SSBS_PSTATE_NI), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_SSBS_SHIFT, 4, ID_AA64PFR1_EL1_SSBS_NI), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_BTI), FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_BT_SHIFT, 4, 0), ARM64_FTR_END, @@ -2341,7 +2341,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .field_pos = ID_AA64PFR1_EL1_SSBS_SHIFT, .field_width = 4, .sign = FTR_UNSIGNED, - .min_field_value = ID_AA64PFR1_EL1_SSBS_PSTATE_ONLY, + .min_field_value = ID_AA64PFR1_EL1_SSBS_IMP, }, #ifdef CONFIG_ARM64_CNP { @@ -2711,7 +2711,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_EL1_F32MM_SHIFT, 4, FTR_UNSIGNED, ID_AA64ZFR0_EL1_F32MM_IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF32MM), HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_EL1_F64MM_SHIFT, 4, FTR_UNSIGNED, ID_AA64ZFR0_EL1_F64MM_IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF64MM), #endif - HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_SSBS_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_SSBS_PSTATE_INSNS, CAP_HWCAP, KERNEL_HWCAP_SSBS), + 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), #endif -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel