From patchwork Mon Nov 11 18:29:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179117 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7051342ilf; Mon, 11 Nov 2019 10:57:27 -0800 (PST) X-Google-Smtp-Source: APXvYqyCq8dGoMsCHk3sMP5E5wLYakAZe6twiAnXv9j9qSmYo0VctYdE3NhMjjDO6vYlcG3xRoSB X-Received: by 2002:a17:906:3ec8:: with SMTP id d8mr24515776ejj.55.1573498647743; Mon, 11 Nov 2019 10:57:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498647; cv=none; d=google.com; s=arc-20160816; b=kpBhmH+cTBBGWYmcncoM0QlQFP9RIRjUMnYNsqrKCJDSU2etU/RWRbWrPTuU5m/5SF /bY4kG/N76FN31xhY2LV0sYPri+n3l6SmLuK4kdNh2liwcmGkny9Jit/HZN+ojB1FIRF 3XA7phaXdUQdpvmJ+g3WSS0eHygTMr9eOqbwBudoJr61iezJ2K+cGjuOZj4F+h356ICc EA++CFP0hjRJ/FJddk8YQqyVb/7kYjJ1oTybsvFwh50m1J7FtU6U/0l7THc8osZCrhKq vWivEN4NWr0p7iwJikimlbx7vSlWSDrDIL6p1roFFwV0m742Q2BbWb4nJPLXlhXyXPGQ DZpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IIuDYXfGHCgj3yAC8P9Xv9dPIH9KPEnkLjjjtQ+HTWE=; b=AVeB5B7pr51P7iKfvsvREKZEiGnVAajA3ojCORuPdQQ9DCYYO57TRXxMvVKQTdp6rU SnE/oiLoKX52k38Lkhc/w+JqOB226VFiyFo+MOXjQ77kVAe/VVthU5NFLhnISUuV4PMZ lvNTly6xllapAmUrJYCTjzznLLnZvmobaE++1JkEriSLUpyBZD7us/0sq6c2suM9ykrR 7ekfIodUWT31AQbhJxgTSL6xd8a0HE/aLvzMK+BVNW23kbNzTQvkEDVzbNxABVsKkcxb U7mJC9dgjsoGWTpSAUkyCJgU3MJo5WpEAR9G4wFweVm4jrd8H4oRsTkKArs7hRKFlUPS KL1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3DByFK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ny24si9542322ejb.317.2019.11.11.10.57.27; Mon, 11 Nov 2019 10:57:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3DByFK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730834AbfKKS50 (ORCPT + 14 others); Mon, 11 Nov 2019 13:57:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:56722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730824AbfKKS5W (ORCPT ); Mon, 11 Nov 2019 13:57:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E683B2184C; Mon, 11 Nov 2019 18:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498641; bh=DM4dbc8qci9+aEw015cRNaVM6ammj5FoIyYGEmVmkZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c3DByFK5KvcAX9czNGD4A6QQKPtTTVKHkjQhYBsUkb/QvoSxy1H100gBuUCwxG02Y BCe2tfcDWNjLL1TfBlFS/sxpy85KNFpTBXz7yzmBggLWfoTYZDUfXuumHDccoB0X2t pOrQ9Bh6gIp6vDMbAwIoyYQJcPG65dXPZeQmH3Ik= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Will Deacon , Sasha Levin Subject: [PATCH 5.3 178/193] arm64: cpufeature: Enable Qualcomm Falkor errata 1009 for Kryo Date: Mon, 11 Nov 2019 19:29:20 +0100 Message-Id: <20191111181514.236855312@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 36c602dcdd872e9f9b91aae5266b6d7d72b69b96 ] The Kryo cores share errata 1009 with Falkor, so add their model definitions and enable it for them as well. Signed-off-by: Bjorn Andersson [will: Update entry in silicon-errata.rst] Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- Documentation/arm64/silicon-errata.rst | 2 +- arch/arm64/kernel/cpu_errata.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 6e52d334bc555..47feda6c15bcc 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -124,7 +124,7 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | +----------------+-----------------+-----------------+-----------------------------+ -| Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | +| Qualcomm Tech. | Kryo/Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 | +----------------+-----------------+-----------------+-----------------------------+ diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 1e0b9ae9bf7e2..4465be78ee466 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -659,17 +659,23 @@ static const struct midr_range arm64_harden_el2_vectors[] = { #endif #ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI - -static const struct midr_range arm64_repeat_tlbi_cpus[] = { +static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = { #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009 - MIDR_RANGE(MIDR_QCOM_FALKOR_V1, 0, 0, 0, 0), + { + ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0) + }, + { + .midr_range.model = MIDR_QCOM_KRYO, + .matches = is_kryo_midr, + }, #endif #ifdef CONFIG_ARM64_ERRATUM_1286807 - MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0), + { + ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0), + }, #endif {}, }; - #endif #ifdef CONFIG_CAVIUM_ERRATUM_27456 @@ -825,7 +831,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Qualcomm erratum 1009, ARM erratum 1286807", .capability = ARM64_WORKAROUND_REPEAT_TLBI, - ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus), + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + .matches = cpucap_multi_entry_cap_matches, + .match_list = arm64_repeat_tlbi_list, }, #endif #ifdef CONFIG_ARM64_ERRATUM_858921