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 8FE00C433FE for ; Wed, 16 Mar 2022 17:10:45 +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=6Cjd0vRb3vHknBxMu+5VWsF5Eb0AR8k5uEhgkmG809U=; b=GYTP4K+0fGZ6RY f0TXz2odUI4sXjTIXV5Rj5x1dys4QBorS9HHU5Zz1traGi86cl+CA2sgkxklI/83lmVhdgAjJqUGF aK4VjOnzl7dV6MfDeIBZ+hk1j1OlF6FUgEQfrZvtd9+wDQq50vVHtGSXf4LWZHi+dJNp/ykzT1VxP UDNPZCVA2i33nHwk1XuCdOYdoubyGA7rUzL3VOCOVRVkg2e0l4c7j9Du/QNmf07FFgBXcERsuGJcS TeMObrDEPlpIFDMN+nThmgnsD4ZxPxoP8nugKW5H7S7/8dELZJA2hudxMFTV5hKyMK2XG/YgMklTQ qt8btCUO3uNqizqAYALQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUX9F-00Ds5B-Mt; Wed, 16 Mar 2022 17:09:21 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUX94-00Ds39-8r for linux-arm-kernel@lists.infradead.org; Wed, 16 Mar 2022 17:09:11 +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 C66E461808; Wed, 16 Mar 2022 17:09:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 728C6C340F2; Wed, 16 Mar 2022 17:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647450549; bh=DtRr1UPNySNMhbk9FgIhQ+SR9SqG7jxUqN92BWwr6O8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mQBoNCaLrw5Q9OqHLBR7sm8tDiUL6aH0mrzuQpp9gLbYxpefTdD7T8OIKJmA82xlP 3zxrBxxjd2XIRKlEuk7ELjFAgX3G4XTPCOpMUJ42yuBXVeAelEqUVSjffn36aWwbhq /hCiPIO4MBdqgRhXdCsE+Pj1fMCJMH+wOj1NvhIsQ68dRj8UWanft5009PPwe0ZIWU TOCphXw6bsK8Q1uj+GaQS4debwZljLFovDfmheKPBXrtEI5FzB4BPwKAKjQ4N7om6+ 3nUFa+RVraaAB9bfhAjZDzqJ9E03TlYa40GDtyqjSAnsW97ofe4xyUm3kEG8ass/sK Fhln7x0u7tSHA== 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 v2 1/9] arm64/mte: Move shift from definition of TCF0 enumeration values Date: Wed, 16 Mar 2022 17:08:41 +0000 Message-Id: <20220316170849.1183941-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220316170849.1183941-1-broonie@kernel.org> References: <20220316170849.1183941-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2077; h=from:subject; bh=DtRr1UPNySNMhbk9FgIhQ+SR9SqG7jxUqN92BWwr6O8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiMhmXJ1dKK956imP92NFbLyHDIsLyfU4ui9lv7d4v f0j6gpaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYjIZlwAKCRAk1otyXVSH0LLWB/ 9NP8MxvYt5+535ol3Ghz9TGfdwuOSmDIU5dQZ1mJdehZ4eT/d9qJh4vHifYNjBEmN8yRqC14cBCuyd uClrGHvfXxVkGWP61qzZquSlUUybfUhJ1VgYJ4n3u1HUueql3uAXnlXzYsfLdgpuJ/g/n4ll2L2zeY u6oJqkh3XYciMZk9rluASrMM1UlG4BqrTjux2nRp3FUt+WLVE51ypCCT53c8g+EKJ/tvSkEJsoGPtO pU+yzjh0/sbU+gx+ob3ASo8HZtZZq8m+Gjar8MUAoMKP+9X7jtnAhwOzf7yV1EZKKzebQVmd8OCIIw i7R6oOne4Dj5ip2JkWWpkVdkgjxLGw 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-20220316_100910_409174_3BB37865 X-CRM114-Status: GOOD ( 13.32 ) 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 | 10 +++++----- arch/arm64/kernel/mte.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index c7ca3a105528..5a5bbd1be3ef 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -670,11 +670,11 @@ #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_MASK (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)) #define SCTLR_EL1_BT0 (BIT(35)) 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