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 1AED9C433F5 for ; Tue, 10 May 2022 16:14:17 +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=e4SwzLvqoSS2W08nJpsyMxzCwmScHwTpu1BSxU8wwT8=; b=AVcSbtJRsFmED2 e1X6pA027/HLY4u3KiZg9nlxxFSzZqSjogyyaYnDcrgU4a32e041Hoq4uqnSVW8bGD/j74BCBv16c 8O6mukgepE35rp+VErKAcfCtlq9KOWLrwOeuZ/3aMNOHgEzR91RECGQhiL921b6foQdkQAhWf8QQY ofbYXCeypXc79vpObyZgK1NOHNwTD0eOTA7OhIhFUvOaaz/EgPniRCTPLsKhCYfWv34BLp6xHqTcy 8gIrigv6zruofb6wDop5OF833jJ0Q7O8q8/58IKNhoqtnREtCu9bFrGY3v9m/aUmuUcfPloq89WLY bi09ZH8v37TCSBsSg0jA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1noSU2-002xjT-4J; Tue, 10 May 2022 16:13:10 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1noSTU-002xWj-0Z for linux-arm-kernel@lists.infradead.org; Tue, 10 May 2022 16: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 ams.source.kernel.org (Postfix) with ESMTPS id 778BBB81E1B; Tue, 10 May 2022 16:12:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4061C385CD; Tue, 10 May 2022 16:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652199153; bh=Mqv0AMz9ME+cWBcWBJ7rkEisQoVgQ4Bbt++E09eMDY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MzMzjpT+xbaFmoJJdBdUmKZVQF/M6PlqzJ0fqyoea+wFouHVVWfopCFgzkHXjPenY 65FluVl6rnfAPxy2CiVQae38WtAJC+Iqc3ZNXxiJR9UYhzLAwJ27g77XPw1fOO9hUZ IcWBTnOOnXFdNC8H2MVdycKWw9bAumpmwv457ejTkttVTn+2ge2D3pI20j3RFOajdz 6zFmV4kj8+RHbzeO6+TGAmx55BwVlzczfZdvCngf5sYaYm/GuhiVksexYrK50a4ck6 tLsNSqOO5ZKb81ynT6Gksva8+KD+Xd/AHMbDuQUbO06AbmNT1Y0AZ23xtx9D5izR+/ EUeQNs2ODtsgQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 04/12] arm64/sme: Standardise bitfield names for SVCR Date: Tue, 10 May 2022 17:12:00 +0100 Message-Id: <20220510161208.631259-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220510161208.631259-1-broonie@kernel.org> References: <20220510161208.631259-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3453; h=from:subject; bh=Mqv0AMz9ME+cWBcWBJ7rkEisQoVgQ4Bbt++E09eMDY4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBieo7QModipC9TWktwg1txd1kQDbhhWOHW0BzoxL6T zJgEBvWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYnqO0AAKCRAk1otyXVSH0G8DB/ 9MZ4WJ4sEtPn5T/oI03YgWgWz3VNvoNSNjlEeySDeIpnzpzw7uFan5nDFgDCUmPVoCuf6EE3c2mSbK rqHq5RA80uvWYyFJybA7zBD5Dm+EsDiu/+ShfhF29Ngq3I3/mvFvnMp3eFEC0duBwpVH/fW5DdEiB9 ZatAXBpl2VHfCTk8d2bRY/mGTE1D0S3HTJh31jF1JTNgUenUB/djoc8DZsMJqPe/Owmcva2vc5XcDc zC8L4mbOwBs/MP5xshPrA562f9ZRXCf+3mNbNZLY0HENuKfyQIhmkyvLV3BDrLnfDNo8FxF3G2er+A rnpQuU75+JholFxOWNw8kaDqgjfNq8 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-20220510_091236_394941_DB27CD3C X-CRM114-Status: GOOD ( 16.43 ) 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 The bitfield definitions for SVCR have a SYS_ added to the names of the constant which will be a problem for automatic generation. Remove the prefixes, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/fpsimd.h | 4 ++-- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/fpsimd.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 75caa2098d5b..aa11dbec0d70 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -67,12 +67,12 @@ extern void fpsimd_save_and_flush_cpu_state(void); static inline bool thread_sm_enabled(struct thread_struct *thread) { - return system_supports_sme() && (thread->svcr & SYS_SVCR_EL0_SM_MASK); + return system_supports_sme() && (thread->svcr & SVCR_EL0_SM_MASK); } static inline bool thread_za_enabled(struct thread_struct *thread) { - return system_supports_sme() && (thread->svcr & SYS_SVCR_EL0_ZA_MASK); + return system_supports_sme() && (thread->svcr & SVCR_EL0_ZA_MASK); } /* Maximum VL that SVE/SME VL-agnostic software can transparently support */ diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 1d2ca4870b84..69ce163d2fb2 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -192,7 +192,7 @@ static inline unsigned int thread_get_sme_vl(struct thread_struct *thread) static inline unsigned int thread_get_cur_vl(struct thread_struct *thread) { - if (system_supports_sme() && (thread->svcr & SYS_SVCR_EL0_SM_MASK)) + if (system_supports_sme() && (thread->svcr & SVCR_EL0_SM_MASK)) return thread_get_sme_vl(thread); else return thread_get_sve_vl(thread); diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index ab2d7cbc63fc..4459cd4a37f5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -480,8 +480,8 @@ #define SYS_RNDRRS_EL0 sys_reg(3, 3, 2, 4, 1) #define SYS_SVCR_EL0 sys_reg(3, 3, 4, 2, 2) -#define SYS_SVCR_EL0_ZA_MASK 2 -#define SYS_SVCR_EL0_SM_MASK 1 +#define SVCR_EL0_ZA_MASK 2 +#define SVCR_EL0_SM_MASK 1 #define SYS_PMCR_EL0 sys_reg(3, 3, 9, 12, 0) #define SYS_PMCNTENSET_EL0 sys_reg(3, 3, 9, 12, 1) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 95a733d3b253..8b48e870e14e 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -1893,7 +1893,7 @@ void __efi_fpsimd_begin(void) svcr = read_sysreg_s(SYS_SVCR_EL0); if (!system_supports_fa64()) - ffr = svcr & SYS_SVCR_EL0_SM_MASK; + ffr = svcr & SVCR_EL0_SM_MASK; __this_cpu_write(efi_sm_state, ffr); } @@ -1904,7 +1904,7 @@ void __efi_fpsimd_begin(void) if (system_supports_sme()) sysreg_clear_set_s(SYS_SVCR_EL0, - SYS_SVCR_EL0_SM_MASK, 0); + SVCR_EL0_SM_MASK, 0); } else { fpsimd_save_state(this_cpu_ptr(&efi_fpsimd_state)); @@ -1939,7 +1939,7 @@ void __efi_fpsimd_end(void) if (__this_cpu_read(efi_sm_state)) { sysreg_clear_set_s(SYS_SVCR_EL0, 0, - SYS_SVCR_EL0_SM_MASK); + SVCR_EL0_SM_MASK); if (!system_supports_fa64()) ffr = efi_sm_state; } -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel