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 EA3A8C433EF for ; Wed, 22 Jun 2022 17:55:59 +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=zopT+nNSdR3UZtjXdabj45vJqc+XHqOmhYgEY1iYQ4A=; b=NkXOI8iWiPQud4 18psO3By4PFgq3S8Fnagd5hLUQT7xNYYmBTW+kZ68ZiN+QQDknqAp0T+XxE2UsSDXiKIx+kN6FqYa Fk9x1XBsqepPN7u1yxZQT8Y13sKKOWVPjIPdyPLHuB5+17klWVgKovINEwIhJpUAuRlfUdVxBuszx fOMEVm/IpkPg4jD6EAFHd4ZE6+CkrUlr9FGdHJnpB7JVDXZkWyfMzNPcSFya8iUFs8BBYWUIepM9i 5pFU6x/ZHk5cJIxG/B3dzhi6DcNwBYkO90384UMXXa6j75uBK4mSTw0n0oycmLpm70PaPGX/QRQsl 00Yc6m3AmLyKkEkwbObg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44Z4-00BmNE-U2; Wed, 22 Jun 2022 17:54:55 +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 1o44XG-00BlVV-FN for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 17:53: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 ams.source.kernel.org (Postfix) with ESMTPS id 2A000B82073; Wed, 22 Jun 2022 17:53:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87DAEC3411D; Wed, 22 Jun 2022 17:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655920379; bh=gg+HwstbBBXxvPKEJ0G5tNAioO0xJMhsln1KH6FrwK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZId37l/fCX+mKDJmCGAl5V4M7Ntd3NV+SYtSOXnyHL+5UicTIJOov2zyJlFQpB6+5 nr+S4hRR4hV+LiyTTEiBF651VKIG8dDTm6IZyn4mSruCEWWeMByzwOsyWlzxhe339n AaR+iOcS/oFnU3k22KUcHXA5fzxjE7og0mb092DRNuXpXrJGpJSaVXyFmOLbNxmSHp p3Boau1cBLNUXYNYYCB8X/QXSy3DlDuSA+jOuC+21FLcr89u1/wuiXiYHV3VC2ApGf vz1wC42RHIMsHW1Bu0NEOq18/J43IYitgyVzZ+ZKe8uudQ+YG9je8hcuSkgCEE2tCp j8G/0FHM9vsjw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 07/27] arm64/mte: Standardise GMID field name definitions Date: Wed, 22 Jun 2022 18:43:56 +0100 Message-Id: <20220622174416.1406282-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622174416.1406282-1-broonie@kernel.org> References: <20220622174416.1406282-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1901; h=from:subject; bh=gg+HwstbBBXxvPKEJ0G5tNAioO0xJMhsln1KH6FrwK0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBis1TfacElfXkbGj9Ma5Fx1ymbEvGQm1PUYfPIpm4t 3LAUk/qJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrNU3wAKCRAk1otyXVSH0O6hB/ 0ZnSUYW8OrYPHBCllKJDiWqUhq53EMYLUk/6t3jHocAIW3yoDOv0mqIrJYeu596Do7INJHOG0A5g6t 45UgdRNJ0M/a4LtB0CEZ8vXIsJlXyHe1PMMRQ/ugFjhG54I2l48rRu3qVsBbT2yQGxxdXKjMdtS4LR ixBo2i7MwRdhLpxeHtSGeMg6G17zSOXLcec5Ih42onkYwQJtl429JwoBk+FluPhqg5+WtyrwgBl8Mj nKINemVxNVxN4eCyg0W6dne7PtO3fJWvzgSmNRGLxXklWXXAWcs4Inr939hlztXf8w+rRh81PQ9ojt BGJwcFoivm2/AWQ3BAmriaQ8IES6dL 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-20220622_105302_844399_C7731A7D X-CRM114-Status: GOOD ( 14.54 ) 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 0af7ee9b314d..ae86b422ac74 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1136,8 +1136,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 b9c5b11c17c3..7d838b5f7e20 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