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 A9DB0C7EE2E for ; Thu, 1 Jun 2023 14:25:11 +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=g4RmsEBHtvtD4Kd6xAOhCBiM+x0Ns+xZwGl1jakfbpc=; b=BS0WteNMXBv8g8 m0TnsDR+aarFSl2j3ZU9lvp3XnMAXsm/OLbuP8aGm3en6fsCBVQvB7Ie9QbOg2A2TFwL+jakhzbqb 2QQCt9qqgS6tFDtxLeWQ6rmk7PTyDo/fhr5U0bC+VWXEcM8YYnoHeSNsvW/7NSQw8w5LlKBnGSSo1 ZFqfqWmCx3CN36E4HuvDViRnpiKl/7Lv9IB3TZGCWJn9mUSO4W168wOMAeLoIZkcUviy+pow14THS OqjXwoj9QTVKyWAYLjK+wy82Iay7p0ohQMzChpKfHPo2BFt5TtwgKqQPGs7IXw+wKfrC7OMTheznF RgK+/Maqtwx0j8qDJuEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4jEM-003qFv-0r; Thu, 01 Jun 2023 14:24:46 +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 1q4jEI-003qBG-1W for linux-arm-kernel@lists.infradead.org; Thu, 01 Jun 2023 14:24:43 +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 0E444645CF; Thu, 1 Jun 2023 14:24:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAFA1C4339B; Thu, 1 Jun 2023 14:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685629481; bh=iFcbI4ivGmOzFLR29vY599JXVoj74PF1/SCbnpxPy60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SoiizZz8Es1iWCujyuLtkJJa1sOeD7hi2bL6BvdWmBfzKghvztSVtpsThfzcdOqNv E1VCRQF7ksA+oIxKeNUp4jvkOJJCMglQeX+CdIL3IOCa+w/9eY4c7uW+yx2KV71c77 X7P4aJ8cCoRcL7h+wJOTxacMSyMZkb7lZ8aEExNywtVZZx2kr5AoE0QxjfRVOjCFKE sS5OfJ+0XxxOHBZfBojXQa+2sR6sC7GzrFDO/pBKcTVSkVwKwsJDEyeoCVqi8XkNd8 4Rk0AuIzZS0rTy0iMQ6+rHWAtKH+Hz2dN/6VO/rQVXw2B3yPdbnctXdHl/c4tllblo ZTa/KXiQTbqkw== 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 1q4jEF-0024XU-Sf; Thu, 01 Jun 2023 15:24:40 +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 2/5] arm64: Drop NVIDIA Carmel CnP workaround Date: Thu, 1 Jun 2023 15:24:26 +0100 Message-Id: <20230601142429.12835-3-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_072442_596042_2012F7D5 X-CRM114-Status: GOOD ( 15.43 ) 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 Carmel has a pretty wacky view of CnP, meaning that it was never enabled on this platform. I will miss the hilarious understatement of the Kconfig entry, but these things are better forgotten. Remove the whole Carmel workaround. Signed-off-by: Marc Zyngier --- Documentation/arm64/silicon-errata.rst | 2 -- arch/arm64/Kconfig | 10 ---------- arch/arm64/kernel/cpu_errata.c | 8 -------- arch/arm64/tools/cpucaps | 1 - 4 files changed, 21 deletions(-) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 9e311bc43e05..bb0d3f530cdb 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -170,8 +170,6 @@ stable kernels. | Marvell | ARM-MMU-500 | #582743 | N/A | +----------------+-----------------+-----------------+-----------------------------+ +----------------+-----------------+-----------------+-----------------------------+ -| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM | -+----------------+-----------------+-----------------+-----------------------------+ | NVIDIA | T241 GICv3/4.x | T241-FABRIC-4 | N/A | +----------------+-----------------+-----------------+-----------------------------+ +----------------+-----------------+-----------------+-----------------------------+ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1201d25a8a4..41125ff8ae69 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1160,16 +1160,6 @@ config QCOM_FALKOR_ERRATUM_E1041 If unsure, say Y. -config NVIDIA_CARMEL_CNP_ERRATUM - bool "NVIDIA Carmel CNP: CNP on Carmel semantically different than ARM cores" - default y - help - If CNP is enabled on Carmel cores, non-sharable TLBIs on a core will not - invalidate shared TLB entries installed by a different core, as it would - on standard ARM cores. - - If unsure, say Y. - config ROCKCHIP_ERRATUM_3588001 bool "Rockchip 3588001: GIC600 can not support shareability attributes" default y diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 307faa2b4395..785eeb403db9 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -625,14 +625,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 1, 0), }, #endif -#ifdef CONFIG_NVIDIA_CARMEL_CNP_ERRATUM - { - /* NVIDIA Carmel */ - .desc = "NVIDIA Carmel CNP erratum", - .capability = ARM64_WORKAROUND_NVIDIA_CARMEL_CNP, - ERRATA_MIDR_ALL_VERSIONS(MIDR_NVIDIA_CARMEL), - }, -#endif #ifdef CONFIG_ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE { /* diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index 40ba95472594..a94808ba819c 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -87,7 +87,6 @@ WORKAROUND_CAVIUM_TX2_219_PRFM WORKAROUND_CAVIUM_TX2_219_TVM WORKAROUND_CLEAN_CACHE WORKAROUND_DEVICE_LOAD_ACQUIRE -WORKAROUND_NVIDIA_CARMEL_CNP WORKAROUND_QCOM_FALKOR_E1003 WORKAROUND_REPEAT_TLBI WORKAROUND_SPECULATIVE_AT -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel