From patchwork Wed Jan 10 17:29:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 186962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp941015dyi; Wed, 10 Jan 2024 09:30:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOo20zl/t+NooDPA+gWszkPcDiE5QdkRkWoYBBcn7PFQs7NJQy1tTwBIibfHnhuIrhFW1i X-Received: by 2002:a05:6870:c985:b0:203:e687:249b with SMTP id hi5-20020a056870c98500b00203e687249bmr1151001oab.116.1704907848233; Wed, 10 Jan 2024 09:30:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704907848; cv=none; d=google.com; s=arc-20160816; b=PGTmrILtPlLJ7OwOahVmG8sdFIj4hU2zNWuh9lRRmwlqfIXzx9XyHI60QUv7OOmEmV ume3Tm/uQXtcbUx1KiXEYMJEn7mSHyecq78T9UPbmMiH9EIotuB/WDILPo69H5XcjGEg gywqYdYtcdribHzcBhl6VlA0ajyVl6tYudo1tFpjCKrZJ8W9Z2CS3ooUgB8mKqAhq8I4 vKxIhAhaSSI3TW41piDlh3IEN3uHsLYqoeqc958wMQXnnfOPcVG3e2FDsSj3ylPoqaIu HPm9wFkr4OsArA+Io1pGq2O7YeniHz4l76QRVca58I5VLcYS7i8GrSocYrN+WpBXG4qm lV8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=TtlGnzl9+dZMUPQdCUXK8MbztDEYRkTL9zxQixG/ngo=; fh=BtiBzfyGCXG0105aiYJfh9JjVYJ0Lc+4+J30WZyrfGs=; b=pXEOVCiBNYnbIa12109rCcCR1RCEdUW0IAd4YndGDs/9cGEUERU1Hr5OiVrCBfoPUA 5Llp93jjQshtzqQ5Altnji+iXG9KxHLGiuOv2jefXsb/8rLWezH/h73HdBTkCVL2O+pg spOWYsk/mWalaLz552QVtIRv8XbURigNw79e2mzpphS2QuOhS7g2eXnOYOR7tdf5Fgk4 cteNNw9ATW6nsmnVaTacPZYe0NCPksQM3p61OO3cnzgrFkftr+xtxfZe4jmxSgbwsRar ousfNbJHjl+mg6UbnVECmgbpsJBjCy+XhLox+H4e06YZLrDbmnDdluL5knXOBKtoV+PV 6B2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jqsKVvY6; spf=pass (google.com: domain of linux-kernel+bounces-22537-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22537-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g5-20020a656cc5000000b005c6b4e26664si4153320pgw.548.2024.01.10.09.30.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 09:30:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-22537-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jqsKVvY6; spf=pass (google.com: domain of linux-kernel+bounces-22537-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22537-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B582F285BF7 for ; Wed, 10 Jan 2024 17:30:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5D3B14D588; Wed, 10 Jan 2024 17:29:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jqsKVvY6" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B468C4D107 for ; Wed, 10 Jan 2024 17:29:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 221ACC43399; Wed, 10 Jan 2024 17:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704907791; bh=7wbCjMM7tjumNzK49XR6Y/BSBSyJJnYiOaEyOvr+9gs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jqsKVvY6TAox8wLuIntNXB+DGU9AJBF/cBVBK9ErMZqAggEfYeZKFW5jQ2BLMU3QH 9LicJocbmgS90Jtww5IXQWt7iUmEnDQJIQul2uKxgNNXO3T3Ikl1/wf5t7RAlA4JfA 4ZORrA9D6xj5cd+0r9HwNdQtRkiYwNblmg+W50AJ29aFG5Yr11DNbnFQaI9VQfKr2r TiSCnURh8Tdur0KavaCN7Q5AIvo117S9/OHOHc518dPhKlrVLroZX5d1SBJ/vyLOB4 +Ocu5ah2Qtr5Uek7bltuR6mjBFhbXL1mBwH95GKUL4yrfOAM381dygWRlY9ljpwaLB F1iYvqYzg4wlg== Received: (nullmailer pid 2134037 invoked by uid 1000); Wed, 10 Jan 2024 17:29:48 -0000 From: Rob Herring Date: Wed, 10 Jan 2024 11:29:20 -0600 Subject: [PATCH 1/2] arm64: Rename ARM64_WORKAROUND_2966298 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240110-arm-errata-a510-v1-1-d02bc51aeeee@kernel.org> References: <20240110-arm-errata-a510-v1-0-d02bc51aeeee@kernel.org> In-Reply-To: <20240110-arm-errata-a510-v1-0-d02bc51aeeee@kernel.org> To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787725451997351050 X-GMAIL-MSGID: 1787725451997351050 In preparation to apply ARM64_WORKAROUND_2966298 for multiple errata, rename the kconfig and capability. No functional change. Cc: stable@vger.kernel.org Signed-off-by: Rob Herring --- arch/arm64/Kconfig | 4 ++++ arch/arm64/kernel/cpu_errata.c | 4 ++-- arch/arm64/kernel/entry.S | 2 +- arch/arm64/tools/cpucaps | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b071a00425d..ba9f6ceddbbe 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1037,8 +1037,12 @@ config ARM64_ERRATUM_2645198 If unsure, say Y. +config ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD + bool + config ARM64_ERRATUM_2966298 bool "Cortex-A520: 2966298: workaround for speculatively executed unprivileged load" + select ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD default y help This option adds the workaround for ARM Cortex-A520 erratum 2966298. diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index e29e0fea63fb..cb5e0622168d 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -713,10 +713,10 @@ const struct arm64_cpu_capabilities arm64_errata[] = { MIDR_FIXED(MIDR_CPU_VAR_REV(1,1), BIT(25)), }, #endif -#ifdef CONFIG_ARM64_ERRATUM_2966298 +#ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD { .desc = "ARM erratum 2966298", - .capability = ARM64_WORKAROUND_2966298, + .capability = ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD, /* Cortex-A520 r0p0 - r0p1 */ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A520, 0, 0, 1), }, diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index a6030913cd58..544ab46649f3 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -428,7 +428,7 @@ alternative_else_nop_endif ldp x28, x29, [sp, #16 * 14] .if \el == 0 -alternative_if ARM64_WORKAROUND_2966298 +alternative_if ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD tlbi vale1, xzr dsb nsh alternative_else_nop_endif diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index b98c38288a9d..3781ad1d0b26 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -84,7 +84,6 @@ WORKAROUND_2077057 WORKAROUND_2457168 WORKAROUND_2645198 WORKAROUND_2658417 -WORKAROUND_2966298 WORKAROUND_AMPERE_AC03_CPU_38 WORKAROUND_TRBE_OVERWRITE_FILL_MODE WORKAROUND_TSB_FLUSH_FAILURE @@ -100,3 +99,4 @@ WORKAROUND_NVIDIA_CARMEL_CNP WORKAROUND_QCOM_FALKOR_E1003 WORKAROUND_REPEAT_TLBI WORKAROUND_SPECULATIVE_AT +WORKAROUND_SPECULATIVE_UNPRIV_LOAD