From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E32ACA9ECF for ; Mon, 4 Nov 2019 09:21:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F5C9222D3 for ; Mon, 4 Nov 2019 09:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572859274; bh=RecdTq5IU0JiNxj82bk/jKXmJH67PBYCbpf20VXtTns=; h=Subject:To:Cc:From:Date:List-ID:From; b=ZjhxsLZghiqhDy4PECBMbBLRSOJkkjX5ksf8GKvqYdR8LXTdX5Aw2dwdrvcaMo67D TSUyg1PAxEuZu1bxVrVbe0XGB89YUNyuVdthvn6Shc8bJQuNA6wwlTMO5fBQusXz+b RJ2e1tr7YR9RRHXWXdlLUKpMsU9+veI5xWh8o8GE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727236AbfKDJVO (ORCPT ); Mon, 4 Nov 2019 04:21:14 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:53053 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbfKDJVN (ORCPT ); Mon, 4 Nov 2019 04:21:13 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id C611F2207D; Mon, 4 Nov 2019 04:21:12 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 04 Nov 2019 04:21:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=SCZvf3 0wtKZIWbLFBKxM3Eyr/jzs5WEZWeUP7h7QU7w=; b=qtLg6QlJreHcebNhKB+g4/ 3IhkocsO645eUjujmzZB2cZaql3SPcHQnuJu8sfEVYluQuHivMD9jUNFIk7DO3ci bQGrALU/wZYNohnvNHpeStBRl5hvy/181JluLMcfOOm/dSETOBlndxot2kmj8N4K LwVnJzp+vNzG6wBo4kJC/wlqbhVT9VrBVCw1/DARr4sb8WUAkUPx9mIXIeo8z54V J6PaoZCNXrJPUinQTpxIPj2OmeN8uihD3o13dv/shM1Vxcizb0gJD1PQOPEo8F8B uP296pOjA6Z+7B1GbNzzk4DdtutJr4gQscSbatjsA25MmPKAlT8XjcmQHVl0lCxQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedruddufedgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 3C98B8005C; Mon, 4 Nov 2019 04:21:12 -0500 (EST) Subject: FAILED: patch "[PATCH] arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003" failed to apply to 4.19-stable tree To: bjorn.andersson@linaro.org, broonie@kernel.org, will@kernel.org Cc: From: Date: Mon, 04 Nov 2019 10:21:07 +0100 Message-ID: <157285926713032@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d4af3c4b81f4cd5662baa6f1492f998d89783318 Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Tue, 29 Oct 2019 10:15:39 -0700 Subject: [PATCH] arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003 With the introduction of 'cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")' the Qualcomm Falkor/Kryo errata 1003 is no long applied. The result of not applying errata 1003 is that MSM8996 runs into various RCU stalls and fails to boot most of the times. Give 1003 a "type" to ensure they are not filtered out in update_cpu_capabilities(). Fixes: cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask") Cc: stable@vger.kernel.org Reported-by: Mark Brown Suggested-by: Will Deacon Signed-off-by: Bjorn Andersson Signed-off-by: Will Deacon diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 6c3b10a41bd8..7f9b699969c7 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -816,6 +816,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003", .capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003, + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = cpucap_multi_entry_cap_matches, .match_list = qcom_erratum_1003_list, },