From patchwork Mon Mar 1 16:14:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388741 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3670328jap; Mon, 1 Mar 2021 12:29:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEkkefRM5NOajAtmlBnkNUM1i7hBevdJsqpVeyTGBdVCYc2lpc3G//Eb12b+WIesWxDzuR X-Received: by 2002:aa7:ccd7:: with SMTP id y23mr10617548edt.190.1614630542841; Mon, 01 Mar 2021 12:29:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614630542; cv=none; d=google.com; s=arc-20160816; b=qDF3gLTzQGm/tSrD0Ro6C1777fU+KdUyB/f7K1XGPHM9+AZwi6bMnqxemqlr62ur+F EUDs63yt3EGiFuv/GMl9Q7y8tNPDtWDDGsNmbo/0Kmic7GIUNvATQDHaeLAXi4/q5N/L kgEc4d1Io9EN/T3uVzd/6sBIX5guoK3mVZACzAAjDH18o0wY2gq+s9uDXbiEAY3LmmfX KF8ZHPFJyqXIvFrnnsWeON9h9CMFhK2ygCu0UvJKajXaAOcdAAu4iL+BPKsE5aj5D9OI vhcxLpne8cpVv3XT6K9nU8CzaDoIxWz7aQV9X4IqPJZ8j89qOWYXG5cXlyzupENOYSMp hC7g== 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=1W3IHYrvIIobiASjjnaLgOCZlNyzyDaZ0A2BBZPyAlU=; b=xCybjfj9pt9tYqya49SBlMv5R2iUYH2GaXU4yWCFH6y8m8QRCBzREIFRyD8wo4bjYl Os+p8LgCvNXiOjwxMv58FgQ+0Wdk8d7pNtN0BKTzCpd2oKNsbhayvqEIMNS9ynvSBF8N +F7Ihzh9ixD4a6xgKYdgJuYiLb4MsBlVnvCLh6bAvaTOUkdRK3JEbKTX/rNR5LFY8xm9 AhpIm1B/JOeXxf7waq9Y6t+nvbu+l9NBEy0wfakA7qggMVHnP6fian+xHTMNgd5ygdne f61tIMsLFYyZbpehYWvtN42ezPEORF1Z5+ug7C8FG2Vk7Q+l9fSyv6q2Zt82DD0rLPcJ piVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EMwpJ3Aw; 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 y3si4137637eds.265.2021.03.01.12.29.02; Mon, 01 Mar 2021 12:29:02 -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=EMwpJ3Aw; 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 S243276AbhCAU1l (ORCPT + 13 others); Mon, 1 Mar 2021 15:27:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:45786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238711AbhCAUVR (ORCPT ); Mon, 1 Mar 2021 15:21:17 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D0B02651D5; Mon, 1 Mar 2021 18:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614621893; bh=OVUP3hpq4sPVzg+WMZs4HT5LnDJMZeVlsL/StL5zzxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMwpJ3AwQ5hmOf9nHj0t7j9z16q8WDkIeLDAFzdV2Koy8oqsFWvO4I2R1sgI72Zqm yHi2eVrHdeZMg7LS+Eo4OmnwsTMTRkG2sxNzImxeCQpmiAB26NVOMPTjWp4fIVmi+J pk1BqJs0kFQnC+uvBVk8H6dnTTRH99bvI+HSfrx8= 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.11 682/775] arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 Date: Mon, 1 Mar 2021 17:14:10 +0100 Message-Id: <20210301161235.086937434@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161201.679371205@linuxfoundation.org> References: <20210301161201.679371205@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 @@ -522,7 +522,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 @@ -1455,7 +1455,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