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 8ED7DCCA473 for ; Mon, 6 Jun 2022 20:18:49 +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=QTm6Vtk+WDdtVzHeCdogjpR+QZHrQmhFzNFJr+V52w8=; b=lakbSxMcPuOowd K/fKeUYCzl2hWkrmTzvL7ZhhEj6RN2yI/xq277V7fTc9rAvVeTugkOMy63HBaMll+dLKzNlI4MY9r oFW1st7ukNoPBIR6wZVF5lu64pGqYLd/0MEFpbVvdNkOjvE0M+wqZAkaMBaZRgr8qDpRkHLrP5Tuy dNu9dsqvZ+ZG1KmpE7i7SFX6sw78nk6uEyp3M4Bi9byiCOu/utDJPV10i1gRUquNu/u8UxefRv2Zm rOypW831aMA8kCBrMEn5+9YdxGkgTXz8Wd/TpH1zqkAYX4DKu73LZx7ckcpgOZN5VT82vkQFZShJV wYsLqJde8GOdhdPZ+EjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJAQ-002Yza-Jr; Mon, 06 Jun 2022 20:17:38 +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 1nyJ9p-002Ylf-II for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:17:02 +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 80F756153D; Mon, 6 Jun 2022 20:16:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CE8DC3411E; Mon, 6 Jun 2022 20:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546619; bh=7tZ7xELCC8BAkJk9S+WMeCdBxgpvykfsU9YLNWYLnZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZ789pUbLc9QbldZDNoKpnnlDp37Ulidb4k+cu4rJD1O59UVOaN+d4nSM3xbeGLJ3 EeIEE2uT6qwXozDpFMrgPa9EOpxR1phHCsPmBCLnyp2AxWUe1rmUWWM18quY8cvye4 Bo0dMJDBUuQjUf2FfMPwcWoNdxpjyLV4+rShXXEIe8p56q1fi1IrzDbYxS+vB8rp5r v8cEZ3rXTD++/2a+C3JNQoDGOyVlFYJ+qAWZHrgtw3+mRSn8XIrFow5zI8lt+kxtUS tQMthnIipfDsgdtivK8Ozg99gtjQX8VzbckbHxLRaQzx2/zEU9nl3d4+619UGFCE39 TbHi6DQXY9LEg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 05/17] arm64/sysreg: Standardise naming for DCZID_EL0 field names Date: Mon, 6 Jun 2022 21:12:42 +0100 Message-Id: <20220606201254.104659-6-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=1676; h=from:subject; bh=7tZ7xELCC8BAkJk9S+WMeCdBxgpvykfsU9YLNWYLnZo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl+7EKDwf/W8ZmqvxXY67RKU/Y8hVLUDMWkQXdaM 0E2ZKgyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fuwAKCRAk1otyXVSH0HvUB/ 0TnKVGAphV3fCSiXX+NrwGvu0MC6i/lIpHgEfU36ELiQO2erFNxV1aO1EKlgKJ9mrjSH2p4YO1kHfa 9K3aNtXLOUtmCjULT25/HIUvZaEaohBZZv4V1froX0r/6KPnTGwkMTcssLk0AleSX1PfUWelpi4htP 8kLWiqtNt8bZE8Jxmn5f4JFoc1+7AApwNK9TBwCZPCXU8k93pGQ8FAcZG6dZcufNeN9/50sS4n6Xoa ymk78YGQnkOcoe2sWpf6VH1k2elAvEZTW1Iei6jUHNGGSlu6FI+swGTNVyzj5arPtkjF+/WLWANNfW 1Ln/tj9MGj00aV0XizuvX2SRy3O09D 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_131701_680316_53B8D14F X-CRM114-Status: GOOD ( 13.72 ) 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 The constants defining field names for DCZID_EL0 do not include the _EL0 that is included as part of our standard naming scheme. In preparation for automatic generation of the defines add the _EL0 in. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index fa9aa8facc8e..6589d2ed2cf5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1100,8 +1100,8 @@ #define CTR_EL0_IDC_SHIFT 28 #define CTR_EL0_DIC_SHIFT 29 -#define DCZID_DZP_SHIFT 4 -#define DCZID_BS_SHIFT 0 +#define DCZID_EL0_DZP_SHIFT 4 +#define DCZID_EL0_BS_SHIFT 0 #define CPACR_EL1_FPEN_EL1EN (BIT(20)) /* enable EL1 access */ #define CPACR_EL1_FPEN_EL0EN (BIT(21)) /* enable EL0 access, if EL1EN set */ diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 5e57f572e50f..3446144b477a 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -453,8 +453,8 @@ static const struct arm64_ftr_bits ftr_mvfr2[] = { }; static const struct arm64_ftr_bits ftr_dczid[] = { - ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, DCZID_DZP_SHIFT, 1, 1), - ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, DCZID_BS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, DCZID_EL0_DZP_SHIFT, 1, 1), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, DCZID_EL0_BS_SHIFT, 4, 0), ARM64_FTR_END, }; -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel