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 328EDC7EE2A for ; Thu, 1 Jun 2023 14:25:15 +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=dquUwW2uyvPFDYaAzLLwQB9RSvY8E1CbpVvRUdK0W7E=; b=rHfU6UB8yIGxJv HNgffiXxrGWl3yjeKyvrKxRDNbh0zXamk2joPdC+IC+Qb3iDwRqorfwKlo95HQGhjyyoJ2zbKLuXk /kSTFB47ZDZlB/BhLBbwJfJ4Pw1Moc9T9IOpozpzsH3955WExV+XbGoeygLHCYBpZ/CbI+RUe6VWf DFbebU8lZe4VxrBJxZPndtm5hiDItyRSDwiecSp3d5iJchJ5DpddK3NbaombcakvJERcv8+hAeZJa OhnHJRYYpHyNhKBmr3CjHtkQNNvzsIUs421fPxSntt3DZwyEOdTT94B1wrs6IEdK3DCLVsmamLdty 5q/l+xdU20A+zhnKdvcg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4jEQ-003qIz-07; Thu, 01 Jun 2023 14:24:50 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4jEL-003qEY-06 for linux-arm-kernel@lists.infradead.org; Thu, 01 Jun 2023 14:24:46 +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 81A54645CD; Thu, 1 Jun 2023 14:24:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3092C433D2; Thu, 1 Jun 2023 14:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685629483; bh=+jwJteM7kuptOxbR3RNNpyS69zrXUwZDvJLe7at3mak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NsM8n4YmfDbeDnVWOmO4klRyiRXRH/o8QcSmFzY4XlKOSmUMNj7mDMzrQfBsZoPox cX/0SsBIgt0mutLSvIMDCwvw6no3wWoSLwI+ehKAn/7jSIQzS0Xj+gusK3KMW2fTay rm2cdj2aVTbgstpNFT0UCIXZ3KCLZ14H8qaRmLP4F8JCa+aKroEDoa4KFUdDQtx610 wf2YRbiVZBR+g3XD7rM63pHrT/4iYboUxnkd3NOZrCZrLFEjEDt4hknHoQyXvg47uL QjhFt9/18gr6mZQwwaX5jwXfujEkXXDt+SXr9u3ivcdEchGPd63sVEbEpWmQYmAG0P jzz2ZCBBQMURQ== Received: from 90.4.23.109.rev.sfr.net ([109.23.4.90] helo=localhost.localdomain) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1q4jEH-0024XU-QU; Thu, 01 Jun 2023 15:24:41 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas , Will Deacon , Mark Rutland , Ard Biesheuvel , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Vladimir Murzin Subject: [PATCH 5/5] arm64: Remove CONFIG_ARM64_CNP Date: Thu, 1 Jun 2023 15:24:29 +0100 Message-Id: <20230601142429.12835-6-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230601142429.12835-1-maz@kernel.org> References: <20230601142429.12835-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 109.23.4.90 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, ardb@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, vladimir.murzin@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230601_072445_151127_1F738B0B X-CRM114-Status: GOOD ( 16.56 ) 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 Now that all the users of CnP are gone, let's perform a final cleanup by removing the Kconfig entry, the CPU feature, and the system_supports_cnp() helper. The only traces left of CnP are ID register definitions, the feature detection, and the bit definitions. All of which serve as documentation and can be safely kept. Signed-off-by: Marc Zyngier --- arch/arm64/Kconfig | 14 -------------- arch/arm64/include/asm/cpufeature.h | 6 ------ arch/arm64/tools/cpucaps | 1 - 3 files changed, 21 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 41125ff8ae69..02318ad49a6f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1818,20 +1818,6 @@ config ARM64_RAS_EXTN and access the new registers if the system supports the extension. Platform RAS features may additionally depend on firmware support. -config ARM64_CNP - bool "Enable support for Common Not Private (CNP) translations" - default y - depends on ARM64_PAN || !ARM64_SW_TTBR0_PAN - help - Common Not Private (CNP) allows translation table entries to - be shared between different PEs in the same inner shareable - domain, so the hardware can use this fact to optimise the - caching of such entries in the TLB. - - Selecting this option allows the CNP feature to be detected - at runtime, and does not affect PEs that do not implement - this feature. - endmenu # "ARMv8.2 architectural features" menu "ARMv8.3 architectural features" diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 6bf013fb110d..172f3d01ef9b 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -786,12 +786,6 @@ static __always_inline bool system_supports_tpidr2(void) return system_supports_sme(); } -static __always_inline bool system_supports_cnp(void) -{ - return IS_ENABLED(CONFIG_ARM64_CNP) && - cpus_have_const_cap(ARM64_HAS_CNP); -} - static inline bool system_supports_address_auth(void) { return IS_ENABLED(CONFIG_ARM64_PTR_AUTH) && diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index a94808ba819c..b5111f76bc72 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -16,7 +16,6 @@ HAS_AMU_EXTN HAS_ARMv8_4_TTL HAS_CACHE_DIC HAS_CACHE_IDC -HAS_CNP HAS_CRC32 HAS_DCPODP HAS_DCPOP -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel