From patchwork Mon Mar 1 16:14:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388669 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3542956jap; Mon, 1 Mar 2021 09:29:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwByNcfv1TN9kSEX0HLqgTRA3BKG8JVxEXkzoNPjxw7vX0VJmqcnccJKqUOWJ3LNFqVrLVf X-Received: by 2002:aa7:cd87:: with SMTP id x7mr18080582edv.210.1614619781958; Mon, 01 Mar 2021 09:29:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614619781; cv=none; d=google.com; s=arc-20160816; b=WHNXay7Ifu7GD2DkEuIoOca2IZffet42k/TLlXeR0R+NRwEIl9ARWSYq20gDOkAjmV 9CLR/1/ixZfMTwwffhMRGyl/sG0PLG4NWR2ZPgBXUkH9paxQfdo70iqvwA5olUb5bivH BsIF1/Yn6dNEV1SXnNLaGdO/2Bd4xbW71AezSYktCAY8ABUN2lUEDv2T0XuMvavcgPFp 8xeeW1XEYB+ukAvUoGnmcl7nQMtUCjCHxm3SJFTHQ6lwB4IwSNalCk6xnj4h9d24vEJA 32h0rXSWgb338BZZrGXRcQGMrk+ieTGJjrRy83FoaSaJOhOE6ciMyawb7R9QPCHhQUo6 CATA== 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=vplJTzWHAe/tLYWfgH9VuOx3LJ4dQO3N7KqbBOTBuhs=; b=QZm6aZg2Oo/KUeoWNdLuqPuxxUa9OcXDRrPBqqWs0baA1yc9zhqV0cf5EgqVJwGDcV T0+WTmpf60H2q1HUAeXTTWALAUB9611febDqTQF1t2OLpBpAtPnYmos1L6GSKYyI4shV 7dczho74bKCci4+HS0JW7DTLGFA6V1Gp56g+YXM+81+hBC2aiyPR5KJhNgXwF7srEjwd IpE++6Vh4B8k9bA1BY69rGrRx4FT9Tb+GbtTArtp/k0TDSKNBZRrlg6ETwL2n8gmvtQX LiWSPnCV9qkijMSf/I3DGsKgUnLLw/J+dz4FhoCjIau9hu4e6NvuJqVhWzW8rCU7SpUk tDhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SPF+549T; 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 u2si3206538ejg.288.2021.03.01.09.29.41; Mon, 01 Mar 2021 09:29:41 -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=SPF+549T; 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 S238482AbhCAR2Z (ORCPT + 13 others); Mon, 1 Mar 2021 12:28:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:37346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237030AbhCARSv (ORCPT ); Mon, 1 Mar 2021 12:18:51 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B99E6504D; Mon, 1 Mar 2021 16:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617231; bh=1aUp4WnQ0d6xW1Xx1eaYpX3/zb8vkFgrgPhQ4ud/oec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SPF+549TIhCJiUedaiCbULyFeac/LK2drlV/umBJL7ubVQL0TFnY4WbfwWJY/lBDm 1BjQhSxA4H0DHaL580jQb19WcGjCNOtD25nYTldxdiCrOT4tR41UuszXBAGOZzaQ0R ZqFBsFGbnBJBcugrYP6IagjiupN7NB9g+IIflEvE= 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 4.19 223/247] arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 Date: Mon, 1 Mar 2021 17:14:03 +0100 Message-Id: <20210301161042.603544161@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161031.684018251@linuxfoundation.org> References: <20210301161031.684018251@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 @@ -473,7 +473,7 @@ config ARM64_ERRATUM_1024718 help This option adds work around 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 work around 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 @@ -1012,7 +1012,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 {}, };