From patchwork Wed Jun 29 10:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12899733 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 4CC8BC43334 for ; Wed, 29 Jun 2022 10:33: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=aXtqRlxvwrONpPOyoqT7rRlLDGNsaoyPpvHYLiJdIwM=; b=l8KVwJcrmfcxvL xDl6SkYJPUny6zH9poO512BSOgR4q8GljS/dbGFwspFywtqglmWwp+qSYDyuhA4vCYqQwx5Req0Sd /bj9CW8CVboIrxY7ZeGo5bKen4lJtm4e0WXfpdM9doXDrdVudwdTNvJhLorbtHo9gy1XL7Ds6A85k Z4Z0TEUYunbsyiX8QoP4EwMNSiHnMFatBUc5TVGdn4iuPIGXasTHknJHwHIpvFGbRVxtz8Rcb5VOG Zw8R/WGHRXJGXnGG5ZMFbQx2nXWcyIgUMTqqikYvyLsqScXLZH4WQuycW1ccuxCf6aKRuZuvVGIu0 ppcoFZCHVEFysF4Tx2Yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6Uzt-00B384-7i; Wed, 29 Jun 2022 10:32:37 +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 1o6Uws-00B23U-Uu for linux-arm-kernel@lists.infradead.org; Wed, 29 Jun 2022 10:29:32 +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 76D3460F21; Wed, 29 Jun 2022 10:29:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA4F5C341D3; Wed, 29 Jun 2022 10:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656498570; bh=jtyNe/A4FhW1jtUkjd5PNXWfiybc6TlBqUpJEp72yMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zt/P/AXe1qlOEU2aq14eN7wXOYXN4pDtzM5+UxWDMWVcF2Db2fnm/yoQupvZSa0me 1ppom2N9xGRkYbrNztUWWzxwqnnlpI0Hv8hTfSENwF83CgrVRgSak/WWfR3dsVpFrr jNZebA+A3QDWLZSrtSS73HBnbZ/+GBVUfcjVCF2wqkorGq2hvl1K327xzQ5eKBnnZC Da9OFjhXdJ7+PloCPEbNyS8cN3YgMBUTbL5Pyl/Di0EukDer9vkaTaPxeDFapbacB4 pizmvuLp+qldNPO45K7DOHrEGe8ho9IylvKqkD5lmaHdLwM5JYTs/iOwAxAPFRq0wI oCLDmpnmp8OpQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v6 06/27] arm64/sysreg: Standardise naming for DCZID_EL0 field names Date: Wed, 29 Jun 2022 11:28:13 +0100 Message-Id: <20220629102834.36569-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220629102834.36569-1-broonie@kernel.org> References: <20220629102834.36569-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1676; h=from:subject; bh=jtyNe/A4FhW1jtUkjd5PNXWfiybc6TlBqUpJEp72yMU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBivCk/25JXx03a6Hjs6/2s+3BDbquqjz6s9UcJrKNk pVCSB12JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrwpPwAKCRAk1otyXVSH0MrjB/ 4w7rwKoYCcQpV2aBXrWVODx5HUbchNsY2YTMJFvj+pi0q6FAhvjnH6nCzht1uWiyLwvupJ+ab+ag/j CZ2dE7OJ9KgAnebLKAtBf0PCASk2Tdtr6YIZgW+sTmt7ImaYg01Lr9MWDwCg/3D1wSifSVopPK0V0o aYbwRwUop9f2aXEOfjcEg2cCNMTgeeikKCsAxK/J2wbwGAqmf7NbPVpHoBAeZCb7q161hOKr2YNTyH tQs+NVpj5lGUa2lhA4MnmE+35/vB7/sJ4ab/WO9C9fGm5NKwhr2qJ3y6OPF7jZd3h5mzen5QRrCaz4 VmVv0JIkpEuTncCqF0bN+UnHQwQWsW 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-20220629_032931_134164_542587A4 X-CRM114-Status: GOOD ( 14.07 ) 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: , 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 19c6eabfec7c..0af7ee9b314d 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1099,8 +1099,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 b7cd50eb6d8a..b9c5b11c17c3 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, };