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 08DD5C433FE for ; Tue, 10 May 2022 16:13: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=s8jKh8j8aJTTcV54grs9am3nzQ/xX7qMrpgE2EobC1k=; b=VHkzW6RrINmwfv U82qDgXX+xDs/fp6rP3GI13T3qwqkYwdh7SijEHIbrQ/fF666rVA80OBPFYwD6h9jPeKMiMofPWaR 0DxlY0u/RaUyttHGYYPiyxVfY/s28SB3bNSgcXcnLznVqBQOGvId78CgHrWxWYKXxUOm5sZd4pjoV aZWq73nYWSbOpJttH8sgq+NbpkGXWpH7EMX5UFqAiV2bP/gvLX+V7Eb7aokaog0f+3dcPSuSeLcCS bERt8l69DZQUQ6wWnnRMcVdLI2u3yqg7huKrVaOuuOjY+KnVaKcRDaH/yB74bVVFieogyh/36HVjv uo0qpGC03Cw55xHH7OBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1noSTi-002xeH-1C; Tue, 10 May 2022 16:12:50 +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 1noSTQ-002xUx-L1 for linux-arm-kernel@lists.infradead.org; Tue, 10 May 2022 16:12:33 +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 EE92E617B4; Tue, 10 May 2022 16:12:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02094C385CC; Tue, 10 May 2022 16:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652199151; bh=iwfibEgBq1PNlh2RkYZzWIqzl+WO5yXjO/vA/ngX0s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=itbOZi6VnZ5nnkmB/eLGonQbZoBWHY+IBjgwLQaLsZH6iuKc7xYrBS2KqjyNv8NTq 3nLB2p6j4dIt2k1qJp+VMZDC+Z68AgTDHuaiPh1zdvOwImJjfujhgcv4QYjoWaqlww QIxBCSLOWzmMnFBsDXerczWikPo+49C4QoXFqEMZ7yAExtBIjzOGvndnt4X3PAggLX S66EqUZPfQN+9NfymyReyyM4b6h679/Fdzwy8hJz9UlWU+3LprNg8pjFYjTvGLOtKI 6I9tw+CxcFS4d9mW7kz0wbX09+ZQiC/Ui6mlcKo7DdesjiE0nEEdRAakw7B4TV9P2x Y+DlERrNgR5dw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 03/12] arm64/sme: Drop SYS_ from SMIDR_EL1 defines Date: Tue, 10 May 2022 17:11:59 +0100 Message-Id: <20220510161208.631259-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220510161208.631259-1-broonie@kernel.org> References: <20220510161208.631259-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1545; h=from:subject; bh=iwfibEgBq1PNlh2RkYZzWIqzl+WO5yXjO/vA/ngX0s4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBieo7PrpMCU9oRcx3L4fdIXR0PnEmbHsiJUQD8p9Nq FCMvzXaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYnqOzwAKCRAk1otyXVSH0HoLB/ wIt74jD4Bovlof92hSIsjas8as1832q+vrWXrefnG39H4DtMDZqnIm4Al2/r5zqZ44T5GUWJuLY2Ve gLfnhv3ywInSWOUwmUZskMoa50TnCTmmJxPSxTlICgnLJtOYqnJi0xw9dHA4Si+woYm55V4iQny51y HofJRJ3UGUJlI5cfHPMBALPGqR+edltrMZmGWhiD143o22zPNnhijRatD6fXmrwPvANGY4nlc8NHcj GR56uhMeEeXO4V4b9s9Y2hvdfecxBvsu2xL5Q2XV+K0gEsZJqzKJrwApTW0dxpGE569kKh12v1wyFF 4iI2EEOzSXOSExGXKOenyc52iNpBQQ 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-20220510_091232_768103_15192DCB X-CRM114-Status: GOOD ( 12.03 ) 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 We currently have a non-standard SYS_ prefix in the constants generated for SMIDR_EL1 bitfields. Drop this in preparation for automatic register definition generation, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/el2_setup.h | 2 +- arch/arm64/include/asm/sysreg.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index fabdbde0fe02..34ceff08cac4 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -171,7 +171,7 @@ msr_s SYS_SMCR_EL2, x1 // length for EL1. mrs_s x1, SYS_SMIDR_EL1 // Priority mapping supported? - ubfx x1, x1, #SYS_SMIDR_EL1_SMPS_SHIFT, #1 + ubfx x1, x1, #SMIDR_EL1_SMPS_SHIFT, #1 cbz x1, .Lskip_sme_\@ msr_s SYS_SMPRIMAP_EL2, xzr // Make all priorities equal diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index b83808ebc58f..ab2d7cbc63fc 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -467,9 +467,9 @@ #define SYS_SMIDR_EL1 sys_reg(3, 1, 0, 0, 6) #define SYS_AIDR_EL1 sys_reg(3, 1, 0, 0, 7) -#define SYS_SMIDR_EL1_IMPLEMENTER_SHIFT 24 -#define SYS_SMIDR_EL1_SMPS_SHIFT 15 -#define SYS_SMIDR_EL1_AFFINITY_SHIFT 0 +#define SMIDR_EL1_IMPLEMENTER_SHIFT 24 +#define SMIDR_EL1_SMPS_SHIFT 15 +#define SMIDR_EL1_AFFINITY_SHIFT 0 #define SYS_CSSELR_EL1 sys_reg(3, 2, 0, 0, 0) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel