From patchwork Mon Mar 1 16:14:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 388716 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3627607jap; Mon, 1 Mar 2021 11:23:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+pjvt6qlobflLSnwyW9cXVjHKwRqiXCDwbwgbW4I2OFSsCNiSZ15yEmjZ8648tM5zN7fj X-Received: by 2002:aa7:d0d7:: with SMTP id u23mr15230703edo.255.1614626605476; Mon, 01 Mar 2021 11:23:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614626605; cv=none; d=google.com; s=arc-20160816; b=Qlzck5yjoU0eS1IbMKz3/FAt2OP1hSJejiC7X/TfZXFojW7aGIEdWjyg45ygIR3W3n agV1iHeB0Xl9hOV/NUtE8vcfuXx+9+q4wi9IGmn5HoyFlcMo3SesQ5/oYNN/nCLniYfV nkCgQfu5cBm3OpXM9g6Q0JVao2/2nDSHxQP9MFEkUexXl6nkDpqqWxJFUJ65jbjgz8AE wcgPeP5FP3KgBhRrqRSrh4lljQ8iCKYaY1nhBzxsMRhpG8jsEC0+QHspSE1JGpdNVE3L GUz6pEpUZuls7l02q7ei9kob5h2qN5LtYpC9Mm4T6O7ErFd5EMTrQFU9qcXeK3dH9Vim ND6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gfGHe/MLm7Dlg3hRqCcfpAJb+WK1edLdcLGuqHOBwpA=; b=H9aS0aapdanUMLjITsETgRwSpZGheYwymUEbvb/0AEkDn15L+5yYOKLzWqYemaDy0Q DMkY9tT7ZYh39OmBoTgCFu8u42j0L8eU3Bmsz8dgOZZPcvM+9+0kuwhiM3Nrk8e1iF+4 jUh0whhj2JtQ3FJMuJpdZV+mcoLGvxVAscrXlO8G0uOryD6ylZNOEMCpMooOaJnyPjGc wBdsZIChNXCZcsfkD+l1twHouZGQdiyguAFDT0zU+6CZm3kk2OOjoq7GTFq7mkhILhJo 0BpGSceUgfjvOmbplgepTuCvxisL+jC3TOzR0Dp1gzgbQptzLWIrmkGmNYJVa7IqadGF tdmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1JNPXlNP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r15si11591578ejj.134.2021.03.01.11.23.24; Mon, 01 Mar 2021 11:23:25 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1JNPXlNP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236397AbhCATWA (ORCPT + 13 others); Mon, 1 Mar 2021 14:22:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:43036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241295AbhCATP6 (ORCPT ); Mon, 1 Mar 2021 14:15:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D208764FE5; Mon, 1 Mar 2021 17:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614618094; bh=wfxjql4rAZGSoFpCGp0+BZwZYE26VtTFaH0Hf54wbMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1JNPXlNP9su0f9eoOChv0GCtsNvBGBdna9r5qQz0umFNMefkbnz1NTSIPihkH+/ZQ eDgS41/BNnT2/IfznbRScqgs7oRAxKSlsfQsc32oV4bFA94uQ3kTlaJw7DisYLvTx3 tjyO8HiTVagsr3xry+YApy2ESRf9B/dqK1bdD0XU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Catalin Marinas , Will Deacon , James Morse , Kunihiko Hayashi , Suzuki K Poulose Subject: [PATCH 5.4 305/340] arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 Date: Mon, 1 Mar 2021 17:14:09 +0100 Message-Id: <20210301161103.291562586@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose commit c0b15c25d25171db4b70cc0b7dbc1130ee94017d upstream. The erratum 1024718 affects Cortex-A55 r0p0 to r2p0. However we apply the work around for r0p0 - r1p0. Unfortunately this won't be fixed for the future revisions for the CPU. Thus extend the work around for all versions of A55, to cover for r2p0 and any future revisions. Cc: stable@vger.kernel.org Cc: Catalin Marinas Cc: Will Deacon Cc: James Morse Cc: Kunihiko Hayashi Signed-off-by: Suzuki K Poulose Link: https://lore.kernel.org/r/20210203230057.3961239-1-suzuki.poulose@arm.com [will: Update Kconfig help text] Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/Kconfig | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -489,7 +489,7 @@ config ARM64_ERRATUM_1024718 help This option adds a workaround for ARM Cortex-A55 Erratum 1024718. - Affected Cortex-A55 cores (r0p0, r0p1, r1p0) could cause incorrect + Affected Cortex-A55 cores (all revisions) could cause incorrect update of the hardware dirty bit when the DBM/AP bits are updated without a break-before-make. The workaround is to disable the usage of hardware DBM locally on the affected cores. CPUs not affected by --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1092,7 +1092,7 @@ static bool cpu_has_broken_dbm(void) /* List of CPUs which have broken DBM support. */ static const struct midr_range cpus[] = { #ifdef CONFIG_ARM64_ERRATUM_1024718 - MIDR_RANGE(MIDR_CORTEX_A55, 0, 0, 1, 0), // A55 r0p0 -r1p0 + MIDR_ALL_VERSIONS(MIDR_CORTEX_A55), #endif {}, };