From patchwork Mon Mar 1 16:13:46 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: 388723 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3636484jap; Mon, 1 Mar 2021 11:36:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwP6TSABKdsllfUvK6GXMCSjxvqE7fcLA+dlYCwE9mUPG6k2HZQYnKh4vt8JzX8vBOYzdYc X-Received: by 2002:a17:906:c402:: with SMTP id u2mr17310382ejz.546.1614627414485; Mon, 01 Mar 2021 11:36:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614627414; cv=none; d=google.com; s=arc-20160816; b=t1gRrExs5diNkYwuHRcsZ8JA3FfzQd/cozVC8rEgjbCYIIfcWZiThC9szAmJQDQrlB /+S7IONBLL3YPxEZaSMPdGFrC0DatKGlt8PQij+WefIMN89oP+z/vd0uD8Dhc9F0MtxO EXtd4uxab+RqqW33gAsR+HJM15blX5LtyR532SlyxJx8aS5QKlv02ww8nqkOicmMk9WD yjEuFhTpqrDYHyRhoYINNUa5aBlKqEA9CvfwJ6jCMhTkfPWj/SHZIGKi61knWEgTocth 9nmhvds4Btl7Fz+nncP760rdZ9kulurA4u0HXDdxahqeIkKvzZfPmBsKwU1RtAGIz9EQ cnIQ== 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=/rjDXDvzTFbPNqamzjGI4MFe3xdWId9lI6fee/GIiaI=; b=EMdjK7/aPpVPDOI/D50mVQhIDBdFpsTlY3xtwiTVJpBcJjNLYVwr3YcHtiFRISnLFZ XK+TFI+/EP9Go6rao3xz8N1ADo3tkeMmXeTajyjP1aeuANtOJ7rAIoxlJtOvBnYnq+b4 kybwH7BeH8Bi8xK2aR1UVO0vLTR3u1U2jamk9TMT8KXmR5vvlXJmNU9fs2CKIBV1HaQa 9OQp9P7LyG2upVLKyGySi13CFdRvylwkHp3FCs2gJ+sYPlIzbig+11Y7Ykpj/X+smkXh /IXhu7uRL2F1VErIXylwibENuKULgLKrnkjBgHnd7rZ0FoEMCZeW168CJ4eE+SJmHy6m qGUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HpWaAwN1; 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 a2si13512896eda.350.2021.03.01.11.36.54; Mon, 01 Mar 2021 11:36:54 -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=HpWaAwN1; 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 S242026AbhCATed (ORCPT + 13 others); Mon, 1 Mar 2021 14:34:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:48800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241805AbhCAT3Q (ORCPT ); Mon, 1 Mar 2021 14:29:16 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D77526508E; Mon, 1 Mar 2021 17:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614619780; bh=8WCF+oineygjeY4ucIdrkbCSgKBCtwRSbYcTZlESzYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpWaAwN1lkU1Mk+m4UxIsyOgLcmnoKYycqv3y7Oz2wnmohf2hNE0PBcfG44SUnAIq uMNlGW78Ff84zv4P6Cde1NUPkxA17m8DQrHCgOAG+8pSbx3I3gI5ykjvJiC4qJJFL/ L4Too9h0T8sJEtPFznMhhoB9+1cL+Ny2pr+7ezpM= 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.10 578/663] arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 Date: Mon, 1 Mar 2021 17:13:46 +0100 Message-Id: <20210301161210.455729289@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@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 @@ -520,7 +520,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 @@ -1457,7 +1457,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), /* Kryo4xx Silver (rdpe => r1p0) */ MIDR_REV(MIDR_QCOM_KRYO_4XX_SILVER, 0xd, 0xe), #endif