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 4973FC43334 for ; Wed, 22 Jun 2022 17:55:09 +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=u5AMlFyzzXqFCh wlyGu4eA0SSFASm5VJUZTptJ+AHHuE/4Lv3vVCxVNrUGlbJxoWuDaf+FDQ1bAXRe1ZrAm/+nZuJb9 Js4/PbkQBlqSOuy9iXu9xJLnYIPhe0H6AUbSs9RMF4byI7Yndcyih8SSoLBTqjLmB5j/DAs7nSDkq 7ZzBNNVCA7ojbba7+2rCLb1lmcWf6BlioVPf+sy7yxDot2zyIya0yZ9g75hBcyAO4bOWoEN40dS1h vlMtObGJBqW7RDtJoLCYR9SEGokkCxiucNnQPxRHLtZt6yFhmB37thzqs9FyoVzgZcz5oZ1l9q5Ye /X0OjnXrUYmxcHepIj3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44YG-00Bm0t-DA; Wed, 22 Jun 2022 17:54:04 +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 1o44XD-00BlUB-6E for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 17:53:00 +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 AAEB261CC4; Wed, 22 Jun 2022 17:52:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD11AC341C5; Wed, 22 Jun 2022 17:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655920378; bh=jtyNe/A4FhW1jtUkjd5PNXWfiybc6TlBqUpJEp72yMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B1c/oZKisHdVVHPciNDjUP1fKnYjfcp88D8mzTjIDSLQBN6R2qZTCVZvQQPHKk/AA PPJORaUKC5odejPIsqHYOxZs+HT4es/VnwBIARqEk50ZREhWYOOa0Xdg8tQWfrvOeg J721q4TLhYyqKvjmHFvh4XUSQwwgn3Cy/VCSua7GxGMTdnxyLmgaiMDr9fKKV+jMj+ UC0hH9d4cSF/3NUfg1yPXiQ9qTMRmkxPH+RHaPcEI5U1cCe28rTtyTShsP2Yi8KAuH IsRUAfYNcpJZxgzUCi+4bgcxVQ1TZ9OUHc9Ezi63vwJTUPRDeqpTT9sK1LzCMcMUKj LJr7caHoj1PEg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 06/27] arm64/sysreg: Standardise naming for DCZID_EL0 field names Date: Wed, 22 Jun 2022 18:43:55 +0100 Message-Id: <20220622174416.1406282-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622174416.1406282-1-broonie@kernel.org> References: <20220622174416.1406282-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/pANAwAKASTWi3JdVIfQAcsmYgBis1Te25JXx03a6Hjs6/2s+3BDbquqjz6s9UcJrKNk pVCSB12JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrNU3gAKCRAk1otyXVSH0KkAB/ 4nIHtZQZX3CPhuuviAg4jvjMEE1efwbGrTQwYSFu0YtAHPIjv5ZOGmXcfyoV+jv91LFhJS2rfJ2QsP HgaT+NLxRGPJaB42a/CVg3gILlG6HvFLRV3QYrWloCQV6/l4nbfONsPNSttMqWs//oDT1D17Mb0LM8 HINwkw3eq9ctSN6hZdTbVPuG2wLC4UEqLQf+jUvbnbHfoLPcBj0Sqa8tMriETgfzecuuB6X1iBSg3V 8LMFc1chKeckAl4M5OKvMZrP7vZc8iU42Pn2Rhryw8OF3xNWpWuiiq9gFRougZivWmvnZ1JpwcHLNX Za0p/vISvOXXdEs7PckWiBUNv0gUGf 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-20220622_105259_304451_77162EB8 X-CRM114-Status: GOOD ( 13.58 ) 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 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, }; -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel