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 93E1FC00140 for ; Thu, 18 Aug 2022 12:37:29 +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=OdOft7Xst6FJ8/ZUb7A/bMo9+1NkLGgGizhkpVf1q74=; b=VSpqKQtA728cNh OEOxOcfDXVWvGZ99sSb9hXF280hmr0oRqDrxuOpCbb/HecfYmQ9JzuTCb+beqSGOg4Sf4reHU1p7d CJd+gmC9wa87fqt5/yagtUf+sPZg/gPjowjjVwBqNl87pNsFX1/kzzCobxls6rOcm3K+Otq/kA4TZ tPtHWpx3stI/4aiamovrP9YAVA0iLs/kTZsX1H2ZIU24Qz8nOEqwEwvTZSCuO9C4CerFjPvoq29Z2 MZDD2T81gJTb+qbFqQX3xEf+ChrZuA/yVk2LB7S+kaiKL5y+vWZSUEzDjx3iUHG2nBsAgATvDczJv vpmIrDUPUrl4fIjvVbvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOekw-004fuB-Fe; Thu, 18 Aug 2022 12:36:15 +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 1oOedb-004ZkJ-IK 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 1F2C861593; Thu, 18 Aug 2022 12:28:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17AB1C433B5; Thu, 18 Aug 2022 12:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660825718; bh=OZlHIicS4Os6nfWEgKu9GT+qQ/gHcvXtTcY7VpPRFG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dbRC4CMX+XKyV7DzvqfSUmt33ulNJWtZvA440BuBShDyBZfJkbfUXNiStfQBox2l2 tc1Qrrzez27DrWFP+1qYoLoHvPWJvq9LAHi4bK+OrNftJJB0Kn+lZ29aLnSTPsTU5d N9wgBXEMAUSpZwmPBHGZo970/cfr++hKDuCEjCTG+I+XttYXE3xFZI37cORsz/aHIf cK3FuhLSoG8B/HGIkljPaVeSbh2yRObUx4inzNqJ06MHP7exCTBlgwGBURgQBdHdRM o+QLxSAgczslvJm/N2hx3tKATpPL7Wd9yDsZLjAFiXsuUaN1dXkj0T+CgLVc31x2lD 4wI3Bpw5oMQEg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Kristina Martsenko , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v4 12/28] arm64/sysreg: Standardise naming for ID_AA64MMFR2_EL1.CnP Date: Thu, 18 Aug 2022 13:24:09 +0100 Message-Id: <20220818122425.37889-13-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=2697; i=broonie@kernel.org; h=from:subject; bh=OZlHIicS4Os6nfWEgKu9GT+qQ/gHcvXtTcY7VpPRFG0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/i9pvczwm8Y19ZmpAqc5IOIK6b35AewXlxQr7L5K 0YkSXcaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv4vaQAKCRAk1otyXVSH0GZ4B/ 46Omm8rnDrFrfxQa2P6Us2Qo/b/M/HjosaGphSPf2wDpqqeaGdAAGOi1B1HxF+zwdJPsVdNdqOF+59 cPC5XGOxwauvZJXIqN3wYy1KTp9zNQyhkC0aViv0dvZpoi/gNfKPXvgWgy5nFY64A+2OEciNLlrIAO YrwRQOllu0DutwBN5LD7YNwr9UXArGTNfEwNex8UFdZDvF3xi/jpoNM1BXaKm5+AB13H3KOaPNzQgQ 0tPHeVVLqSfX0MnhF6Wy9w4Ovn0RSilKQQnfjw3/DoOFKK52u5DwbAWkoR/xQj+ciV8B3PrLJxedzy fWahfO7EOoa1mPkQQN9Ae9rIfdj2f2 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_052839_753933_BA122DF4 X-CRM114-Status: GOOD ( 16.38 ) 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.CnP as CNP. 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 | 4 ++-- arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 54f8fc398f90..b03215511c82 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -819,7 +819,7 @@ #define ID_AA64MMFR2_EL1_IESB_SHIFT 12 #define ID_AA64MMFR2_EL1_LSM_SHIFT 8 #define ID_AA64MMFR2_EL1_UAO_SHIFT 4 -#define ID_AA64MMFR2_EL1_CNP_SHIFT 0 +#define ID_AA64MMFR2_EL1_CnP_SHIFT 0 /* id_aa64dfr0 */ #define ID_AA64DFR0_MTPMU_SHIFT 48 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 0ce0d9bbdc33..aeb580eb5c68 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -392,7 +392,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { 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), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_CNP_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EL1_CnP_SHIFT, 4, 0), ARM64_FTR_END, }; @@ -2377,7 +2377,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .matches = has_useable_cnp, .sys_reg = SYS_ID_AA64MMFR2_EL1, .sign = FTR_UNSIGNED, - .field_pos = ID_AA64MMFR2_EL1_CNP_SHIFT, + .field_pos = ID_AA64MMFR2_EL1_CnP_SHIFT, .field_width = 4, .min_field_value = 1, .cpu_enable = cpu_enable_cnp, diff --git a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h index 1653299ff8f8..0ba290e1a791 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h +++ b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h @@ -120,7 +120,7 @@ * - E0PDx mechanism */ #define PVM_ID_AA64MMFR2_ALLOW (\ - ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_CNP) | \ + ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_CnP) | \ ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_UAO) | \ ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_IESB) | \ ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_AT) | \ -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel