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 E7DBAC433EF for ; Mon, 4 Apr 2022 13:51:22 +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=CQBMKqBgwEocGB42TRgoVk58z0iYaLQFoMFX6Eaan2I=; b=Vvn4Km9p81r0fH T7sNz4odk68XZ83lXv9mSG/ioRBVe9PUVoBny/aGp6eOUOmwk82jjfGF3fLMDTIw/cgD3AdHscrgS kiR7czruMirE6DSBV1fHzdK62fUZ6xRHSBWrjiyzuGP0NzlObocEkY2engD2d615RtiS9dJo1nWNr fLkCb9pneU2m7Dm4IlMkcFuXzS9JS3IVOgrT53gyzkFWOPJ620DL4FSDEhxGNzHJrfdZ8iL4yKELC Qt0zd3YKfjep3ELAX+WJZPHsH/NaqSyceh84CrZUlb8DgLjfoVeMN+BfteiOUFvYEXr9VjRO1YESU Tj1of1qo1hzLRs0eTKww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN60-00FBhN-PA; Mon, 04 Apr 2022 13:50:16 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN5U-00FBXb-3p for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2022 13:49:47 +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 sin.source.kernel.org (Postfix) with ESMTPS id 8F850CE13CF; Mon, 4 Apr 2022 13:49:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76519C34112; Mon, 4 Apr 2022 13:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649080175; bh=HnT0/2tdphslRHmuVc7/P8f8kjPyKD5iBHDBYeL6734=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2C0vuYdJsfz07GefRMfrgbTROHVsgLpYpY94/FYAUdu7/kde5vovyiLvnpSnyrtj IwG2Oy1kKllbAs1MMsesD/dwuY7D10T77vNv7+sep5jfnw/gif84xx+wRchbLwAape amHdRpI7qUAlG8rwPCPyvar2YsaPBC72+kxW92z1O+3o3kx+HwALe22GwCYwaDQnoQ I2mZ+TLspSqxSLX8/+eYygX06ScIrVlsma/DacA5hcvioeb30CPfuDs09UiAfeLpyJ yHbd4k30+7yV9OwykuOdOlbiKPBM8OZe3gUvucSS1qKMu89M/8UpPZkLg2XfdGTMR3 D5uWb/IwZYTnA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3 1/8] arm64/mte: Move shift from definition of TCF0 enumeration values Date: Mon, 4 Apr 2022 14:46:38 +0100 Message-Id: <20220404134645.1675346-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404134645.1675346-1-broonie@kernel.org> References: <20220404134645.1675346-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1975; h=from:subject; bh=HnT0/2tdphslRHmuVc7/P8f8kjPyKD5iBHDBYeL6734=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiSva+nxtSEQNqUPZ9V2WrMeC8039dMQE48q6WWZO+ xEt23yeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYkr2vgAKCRAk1otyXVSH0PSxB/ wLL7T3xh6QJuE1Vas8hiDrX1QKNSIumuSnaErSRgoBfutUUK2PrFPSYOl3Uur4VZDD2FL6n2JsFE0d BSoKZYoW7BL/Mf+jtwTYUjpN/clB1JLCgNJpZte+2HFEEqV6QWr12ETYOveV1SvX5tZdDwZVXc3of/ T2JXyrw/xKAe8ZOZ5mK2ZqAvoZfXuwZXv9JzmDwvEXcvX45mp1JmFrGwjKUfYK4YJQnqu9JPZxAQOO 4KbeayWy6ccpfPC7QUDx0oMmWc9zfgJzgEz1XeXKxNfV+CNGvntBEeguUao9QpVRwv/09wh/Vu6Sbm PnyHkAd+0oBD8csTIutsEul/liljxL 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-20220404_064944_601796_61CCE7AB X-CRM114-Status: GOOD ( 13.57 ) 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 automatic generation of SCTLR_EL1 register definitions move the shifting of the enumeration values for the TCF0 field from the defines in the header to the point where they are used. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 8 ++++---- arch/arm64/kernel/mte.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index fbf5f8bb9055..ff7693902686 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -678,10 +678,10 @@ #define SCTLR_EL1_ATA0 (BIT(42)) #define SCTLR_EL1_TCF0_SHIFT 38 -#define SCTLR_EL1_TCF0_NONE (UL(0x0) << SCTLR_EL1_TCF0_SHIFT) -#define SCTLR_EL1_TCF0_SYNC (UL(0x1) << SCTLR_EL1_TCF0_SHIFT) -#define SCTLR_EL1_TCF0_ASYNC (UL(0x2) << SCTLR_EL1_TCF0_SHIFT) -#define SCTLR_EL1_TCF0_ASYMM (UL(0x3) << SCTLR_EL1_TCF0_SHIFT) +#define SCTLR_EL1_TCF0_NONE UL(0x0) +#define SCTLR_EL1_TCF0_SYNC UL(0x1) +#define SCTLR_EL1_TCF0_ASYNC UL(0x2) +#define SCTLR_EL1_TCF0_ASYMM UL(0x3) #define SCTLR_EL1_TCF0_MASK (UL(0x3) << SCTLR_EL1_TCF0_SHIFT) #define SCTLR_EL1_BT1 (BIT(36)) diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 78b3e0f8e997..77614f8bc463 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -216,11 +216,11 @@ static void mte_update_sctlr_user(struct task_struct *task) * default order. */ if (resolved_mte_tcf & MTE_CTRL_TCF_ASYMM) - sctlr |= SCTLR_EL1_TCF0_ASYMM; + sctlr |= SCTLR_EL1_TCF0_ASYMM << SCTLR_EL1_TCF0_SHIFT; else if (resolved_mte_tcf & MTE_CTRL_TCF_ASYNC) - sctlr |= SCTLR_EL1_TCF0_ASYNC; + sctlr |= SCTLR_EL1_TCF0_ASYNC << SCTLR_EL1_TCF0_SHIFT; else if (resolved_mte_tcf & MTE_CTRL_TCF_SYNC) - sctlr |= SCTLR_EL1_TCF0_SYNC; + sctlr |= SCTLR_EL1_TCF0_SYNC << SCTLR_EL1_TCF0_SHIFT; task->thread.sctlr_user = sctlr; } -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel