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 82CA9C433EF for ; Mon, 6 Jun 2022 20:19:20 +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=585aSrYMXAVtCH2yunJ1aM+BYUUEo+3jJ+FDLjtBo+w=; b=cWa7jm7mLwZE/A FTiz1faq7jsDk4HryOfnnD2BAjRP0zOm+7a7lbLDdUpTt8wqXtkSvVL6s5nCVfLIgEcN9jbZz/Kob Xwmo1GZpXxFmHGsB6l/9Fa/chjVnU/cjUFs/L3Htru6KhGxpqcHHLDEqZ6jPfQH5YAVbX/Fdqoq8a s5xb15hw9Jgw0aobrUoGKBcaOy5Wz6iK7nP7QsNJLzCn3UygdXdUmx/4HhPo3+7lYmU0D6D/P0xkP RQGMCVxDtts58I67S5hUtVCdSqHUCvVOd81f6sR+D6af2LTDeOsPPrz6ZC4jJSajjmcJtrVu8J4LL YkB2fU4hnxD+yK6HDzxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJAu-002ZEQ-DI; Mon, 06 Jun 2022 20:18:08 +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 1nyJ9q-002YmA-7d for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:17:04 +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 9619561531; Mon, 6 Jun 2022 20:17:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C222EC385A9; Mon, 6 Jun 2022 20:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546621; bh=7l9GjeRKhGs6NwSMIlcV22CF/iM9WhBxxtMzMYzZX98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WD7YQfFT6X8eCFEj5dYCERyePVIuVfbzfnBGfbx9HtH0Hy825jZvYspMqeg+67Gf2 +bC5nJ4W1YMjpC1000M80sNQ29xdkzMG5te0BIrIFs/YULpfwRO/cT5H7MDHUwGQpO 9MtkDWG5ls7EzyHEn331tnTiN9iGptq+YbJQfGd0lXSM59gfQpRRSwlF0lSlyWJwRd UF5fdc4V9LLlpFAhlA7pBzV6IIPRonl23U2PpKXnzJt/HfgHy9ipy16pZ0Dgw2aO7z PMkQyq6wp+ANXxqdhwkfThqFNQtOYxwHW5pRFxfq4C9dlydWwfDU0D1MVLDOZTFEvm lMRsfrBvTF1HQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 06/17] arm64/mte: Standardise GMID field name definitions Date: Mon, 6 Jun 2022 21:12:43 +0100 Message-Id: <20220606201254.104659-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1901; h=from:subject; bh=7l9GjeRKhGs6NwSMIlcV22CF/iM9WhBxxtMzMYzZX98=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl+8KdOWk9dAHdwKjQIz4Ul5zHP7EbyP8lijkKDh hO7hv8GJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fvAAKCRAk1otyXVSH0PUgB/ wL1jl/o50KnGyX+t6STu89X9liG1NW6duK7WFRg6sKa/KnatIeNd8bir9fIw1Vfg1YWRH9Gr2ae8rb umheRdziIr3HGKITEf+/wBBP/L6/wYktZ2+MLP//lz9RROxel4Yqw7/otRDlfkIOoeoQHhl52hOJ68 sxvIhjTg79tiHehmidNFgM6QMEfGJ/SeUHlleJ84h9TtLzq/38/x0en3ugfWp8tfBzCwg+fC4ZbiEf p/yF8uOG6c/Dwnka+f8d6PsKWwttljSl0nSnSpLQ8WpbyxNPFHH144kCwHhEPWSX72rK6SxVsiH+zu uSSHAg2NuZvh0GSNdwRsGPQ9FWb/GE 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-20220606_131702_387150_F7EF403C X-CRM114-Status: GOOD ( 14.68 ) 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 6589d2ed2cf5..9a2f659edeee 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