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 14153C00140 for ; Thu, 18 Aug 2022 12:35:53 +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=lg6nAulTttKC3Dbxs1pgNPG90nf6eOizNoqU5com/5o=; b=PJXAUkfHWWICD2 0OM5o6nALR+v5W+tGE0YRQHCTUzh9Ms/AqmTn46ns+UDHOJJ9wJIbU2SEV/kqzI9V8Igai2jBcNnK gtQHUVlsS4DXL2XlYGXhZEwHOqwUuzzV2q3uOgMAYp3NVK0EVXsHxo92jp1LV0W9r+FfE0vbkHk+U IWHQvTBCmhJ8vTgfnJWer1gVWogfq1AKJvRzwDpG/nZxsHZufSVE6BpV9zSRpGkFODXXGWf+I6Mo6 Lu/5peRj16bLotnRGk4GV9e0hIO4gy/3zdGMngy7yYWrxrYB7K5uSHUjXzQB52kAy8q4BWVwv5yQC 0MXnCu0pu8Fy2noe2Csw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOejN-004eVo-0y; Thu, 18 Aug 2022 12:34:37 +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 1oOedZ-004Zj3-Ip for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 12:28:41 +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 2799F6159D; Thu, 18 Aug 2022 12:28:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3834BC433C1; Thu, 18 Aug 2022 12:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825716; bh=5oqzol/qol46tbwMi96u4bc581jRhtFsXH/RtJgJUtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZjZK1furSgz7ikWM20D84jSEn4qF9GA6OJMsIQCuJ8TpTKJFKZSWQyvcGFb5pNQTe dLo6RBiAbOKiSi0TRZR2FwX3g+QWslqnbNc42LzXsfyetfWNVBt2l7VgNwvVLR2dLE PEM68aQz5ectDbSIhWW6BtKVUq+er4gpm2znEc0clnrFA5c/voSxGnWIAiR58biTUc sYYSTE15aZIasWCHtDfXHVsYyM0A76OaUV5U8tdJ0nP5lFfRYcHZKLtBQFbpbtgMxc T0FkQ+PLyq2A1LoR7hd8GeRWJlorVUsy4/luyGYBOyOoxaT08xYK/UuTDS5N+mYh5i 5ShC1zJOT1OZw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 11/28] arm64/sysreg: Standardise naming for ID_AA64MMFR2_EL1.VARange Date: Thu, 18 Aug 2022 13:24:08 +0100 Message-Id: <20220818122425.37889-12-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220818122425.37889-1-broonie@kernel.org> References: <20220818122425.37889-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1996; i=broonie@kernel.org; h=from:subject; bh=5oqzol/qol46tbwMi96u4bc581jRhtFsXH/RtJgJUtw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9oJf+9q4BQ+G4yQu7wMdlXs/7A3xPu29D5/dx3 mQj07+KJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vaAAKCRAk1otyXVSH0PaYB/ 4/4Ze+7Vh/1LAjfbxhK2a+6xCIvf7k4afnP4XGXZYfMsJyUWhaYbg+qOvf1pZU5TqfedgqKqhdcWCV v5Sh6ZW7XTGn/HILSaTLfjvUb5W5ySlIJEfh8EzL2d4iAsfaelzorwnXJLT3yqLcMi+J/87iUbiDOn MQXKdJY0yC6MFBCLYGDecrT5XoxtPG15tc80NG18gdXgOVtTLf8trS46+lUBW7iGHAoJGX7+doXvuV UiDGRYpwbYuSEAtQe1EO2ZYQhXmlBDPsjPEpcSZyuFtAlbopcqGvKWZtF14ZvMsClweO7zYbDe5nzh JkKriMvN1wcUp/2cJj5Ih/wACIh0Fy 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-20220818_052837_787279_0F5E4CD1 X-CRM114-Status: GOOD ( 14.95 ) 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 kernel refers to ID_AA64MMFR2_EL1.VARange as LVA. In preparation for automatic generation of defines for the system registers bring the naming used by the kernel in sync with that of DDI0487H.a. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 948a63221434..54f8fc398f90 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -815,7 +815,7 @@ #define ID_AA64MMFR2_EL1_ST_SHIFT 28 #define ID_AA64MMFR2_EL1_NV_SHIFT 24 #define ID_AA64MMFR2_EL1_CCIDX_SHIFT 20 -#define ID_AA64MMFR2_EL1_LVA_SHIFT 16 +#define ID_AA64MMFR2_EL1_VARange_SHIFT 16 #define ID_AA64MMFR2_EL1_IESB_SHIFT 12 #define ID_AA64MMFR2_EL1_LSM_SHIFT 8 #define ID_AA64MMFR2_EL1_UAO_SHIFT 4 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 3f5bc48234fa..0ce0d9bbdc33 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -388,7 +388,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_ST_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_NV_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_CCIDX_SHIFT, 4, 0), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_LVA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_VARange_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_IESB_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_LSM_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_UAO_SHIFT, 4, 0), -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel