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 D96B1C433EF for ; Thu, 9 Jun 2022 17:12:13 +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=U4TMsVn3fWOlO3g0kuqmqe3Gir43S0sd5B58QBP0YRU=; b=O5XGcugbxYGndg R1ek1FcNOxrXkk2q6407PLrI4Gi+w4a6bryzO56BJmUWf+9/xWj5O8nRtGWbdpX1fTwGzmSnW3QFl XBimWb9b9fmczAjvD9C89mIPLiO8kpeg3ECjUuM+PfErWFsVoqwJN4Ze5vEogdTW4nujpqRVnQSHK qdz0f/WK6JIkr3nifkMhUGh/jfC4cNuNlvMy10a6yO6TIx+/6SIIWM0cB2wZGQvRT728sTP/frdNT vApxiMoHPbJuMxQHC9pRSGgrJ9IFNZMAjJISl8oGIN00SZ/v3HoFKFq/itbLdRbemVmvHvm1vG5LI wtmRbDSkGIHuYgZee78Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzLgW-0030Ko-R3; Thu, 09 Jun 2022 17:11:05 +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 1nzLev-002zT8-U1 for linux-arm-kernel@lists.infradead.org; Thu, 09 Jun 2022 17:09:27 +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 86F34B82E71; Thu, 9 Jun 2022 17:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E67BEC341C0; Thu, 9 Jun 2022 17:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654794564; bh=4oiJsBdM27lnFSLH/mPF3zncvlgTVLKs8b1aA6iCN5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N29eD8cGEuO9cErLsHut/wYeFhVhn66PbsbYV428UO6zcC9M8hDa5gHXAw8xRAYJX 6ld2VCncpzZ4CJK1Im8QlmlXtNYkJTZYAkQgtiQqUagGIDT2n10rUDXfziwjcdoLuU kBTe5AdDtbVa3i58U7+i80dlDu8wcqi3Yf2R58GawDPCviYenWRlbBFxWPEMi9taFs b6/K07p9XwKUj4at/A6TeGNNf9FgBq2OiR8o9U/Zl6hw3pWC0SAbY32NdvHC7hxPzO TknX4Ob3YzYhgirT1IdTmiDKRtvgdM6ZbhNy10JdXE7K4LWLjdW48bftXpigw4QI+b lPYCj1KzPuEMQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3 06/26] arm64/mte: Standardise GMID field name definitions Date: Thu, 9 Jun 2022 18:08:40 +0100 Message-Id: <20220609170900.1641343-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220609170900.1641343-1-broonie@kernel.org> References: <20220609170900.1641343-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1901; h=from:subject; bh=4oiJsBdM27lnFSLH/mPF3zncvlgTVLKs8b1aA6iCN5c=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBioikaPsjtOl4Bop0X9vGYZaol5ovUt59Z0EUJBWl5 Eqk8e1CJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYqIpGgAKCRAk1otyXVSH0B1TB/ 9Vpy0a1G2jfTqyWnNrOG7vktbqOKwRk0rFWdwXrIlBgCNNaU7I+Km5+McwlpUdJgPXKcuxPXfF0ZSg JQ98gYdMZhZ47lUg3Ev8zp23QZWUyn4pNiHapON+c4MJo3PxZsc7+uYvdjN5kO7KpSXsFWzFx7XHrz 8AtFuideBZ2C6QH0hJ8Py60Ufv5UZAbHBRznmIWWiYASAmojl47uzgGQMBKxXys04s2qRoPtR/BxiY 2kDG9X51RKDdOt8EGaD3BWBNZuP1SwF5FBC6A71esPEFl/qYbXZLuiF9Zy9pnM43qIActe/4bj9ZKu fQVykGU9YnRq4NjIANOo6ynIyEWAOU 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-20220609_100926_313172_AFF2858C X-CRM114-Status: GOOD ( 14.74 ) 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 Usually our defines for bitfields in system registers do not include a SYS_ prefix but those for GMID do. In preparation for automatic generation of defines remove that prefix. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/lib/mte.S | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 3e0df8ef3e2d..cd35b939f162 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1137,8 +1137,8 @@ #define SYS_RGSR_EL1_SEED_MASK 0xffffUL /* GMID_EL1 field definitions */ -#define SYS_GMID_EL1_BS_SHIFT 0 -#define SYS_GMID_EL1_BS_SIZE 4 +#define GMID_EL1_BS_SHIFT 0 +#define GMID_EL1_BS_SIZE 4 /* TFSR{,E0}_EL1 bit definitions */ #define SYS_TFSR_EL1_TF0_SHIFT 0 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 3446144b477a..a16d1f1d6bbe 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -459,7 +459,7 @@ static const struct arm64_ftr_bits ftr_dczid[] = { }; static const struct arm64_ftr_bits ftr_gmid[] = { - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, SYS_GMID_EL1_BS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, GMID_EL1_BS_SHIFT, 4, 0), ARM64_FTR_END, }; diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S index eeb9e45bcce8..1b7c93ae7e63 100644 --- a/arch/arm64/lib/mte.S +++ b/arch/arm64/lib/mte.S @@ -18,7 +18,7 @@ */ .macro multitag_transfer_size, reg, tmp mrs_s \reg, SYS_GMID_EL1 - ubfx \reg, \reg, #SYS_GMID_EL1_BS_SHIFT, #SYS_GMID_EL1_BS_SIZE + ubfx \reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_SIZE mov \tmp, #4 lsl \reg, \tmp, \reg .endm -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel