From patchwork Tue Oct 29 06:04:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 177989 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4394255ill; Mon, 28 Oct 2019 23:04:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwSBk2whbZDyTqzaecX2chK9MJVd/P3eoGO6ajtqwdS7aocLx8YYTtKh1PPzwi1mS8zd521 X-Received: by 2002:a50:a2c5:: with SMTP id 63mr15463557edm.48.1572329089286; Mon, 28 Oct 2019 23:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572329089; cv=none; d=google.com; s=arc-20160816; b=O8XZRSuTY3hRxrCjfwDr+xq0cNx5Ihm76D4/nt8XRkCjjqAq8MdxJE3r66fevq9j26 IDFeXmhe3oZHiQxFgCInJOfzTxajUHm1ya+zFs7/AUmAqXa8VYJPucfdVaYBGIqEb86H T0M4pSfUU26X8wHkwOBpDu7m/+FnmeW8rw9wd7cWNiCN8stWpybNPmmSLwY9toveFe9W Iezf8MxRyWrEET7YiXtUGOg4RJ5VFQifxKeEuBzF7mSGVDKrSgvzVbf/HS3t5D0DvQq+ Jd4hTAAfWexFcVuQ0MWvOp9MXWVsJhQOfFO3CFAwrcp/38/B2l9D3NnlF8oSy8xFPxc3 2gdg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=W39xK+ySX7H/kO8T3j/KlPzC4OMMNyJJ/QXMm12Hpvo=; b=WRzN8v22N4SdLpkdOR3xe63bJxjt7P/AV2Uxq8F8vENjD3x/NpAxl6450kpdWSeskX B1dtctcF90sFp5jGW7A5SU8fb5GGdy6wYt3v2VvIQx8XqlNBW2gFXsANBDssT6tmk1oa R2ntpYY1uabp5AHM/pxaP2oDfKsXBaw0ky/cRiTym4r+aL41XRcD2BaFFfBHKg0090Tw dcfjpT47oVSIJf3I/NvzVkITHhQuK5H+eNHnPncWt+g07pJk8dW6OzEnUwsNhxMldqNl tiSqlFj/b8ktJcGQZYigW9zfihC4D5iO0Tej4m6yBvjrnTq2SEqtKl9ZCt+atPIAngIK 4Kog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wFrRxMAB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dd14si7684882ejb.163.2019.10.28.23.04.48; Mon, 28 Oct 2019 23:04:49 -0700 (PDT) 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=@linaro.org header.s=google header.b=wFrRxMAB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732149AbfJ2GEl (ORCPT + 14 others); Tue, 29 Oct 2019 02:04:41 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45170 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729798AbfJ2GEj (ORCPT ); Tue, 29 Oct 2019 02:04:39 -0400 Received: by mail-pg1-f195.google.com with SMTP id r1so8743520pgj.12 for ; Mon, 28 Oct 2019 23:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W39xK+ySX7H/kO8T3j/KlPzC4OMMNyJJ/QXMm12Hpvo=; b=wFrRxMABLQ165DVY6sbzKHMB7LJ758eBnstL/y7tQiTvNJ9qfonFBbEVwfm1VzIvhs S8hLdkn+0DTr6yTaAHC5L8W9b3kpDiVc4mfQwg8oO95RSOabs0CO4WrVpZ365J6VX0gV on2uKoTVeYVQr9p+1nh+gN3JFQMEPC081QZU8CGnjIihtRlciaDuYCmXQaLntpBK1ce6 o7VnDWn4v6iHmLBg8J6MkEMLrR3vHk1RB2SSc+ys4dF47ak0gBDS7/xKfkKV1OFtbxI3 j9c23q+7PiFpC5iotdyjTlXjR4CD39Y+6SGhAfa8+kOpGvl7urHlU/+X9GptTa8zT4xG tt7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W39xK+ySX7H/kO8T3j/KlPzC4OMMNyJJ/QXMm12Hpvo=; b=A09YNtiC5nKaSKj9lY+XB4bQt/gYPkR63xmcrLVXPyUG498kria9qmJofw0B8Eafvr 8L39JjH4y9GXD74F7wcUS+U5kpIqm6d1T3go3QoEr2nk9CJHUlyJJTpdoZhz3XFxxG9O 5zD5zOLYxpBSX4H47TlGx85zTSnu1SCTrx2vfYVaA4nVEvuDIG584hdZmaMeyyMG/V0y fP6qGE+K6ZwMBuO1xQd/uK46+iX9xx8KJVWuxE5HN7+BcRYsWa0XaScBLSJySfW/KbP5 7IQCcUGYnoukhWsFUthsxZ4tV0wckQHSNxdW4sRXQTXN15fSbYJeDnboFtz7FIez4Np0 BcTQ== X-Gm-Message-State: APjAAAU2javUT/b84+5V+0lkEyyhqWiudOmc+9mphTutuun6n4VnY5s3 ZK2dnIDfyvp9iQxp8DpcZYnkWQ== X-Received: by 2002:a17:90b:282:: with SMTP id az2mr3930080pjb.23.1572329076618; Mon, 28 Oct 2019 23:04:36 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id q34sm1338607pjb.15.2019.10.28.23.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 23:04:35 -0700 (PDT) From: Bjorn Andersson To: Catalin Marinas , Will Deacon , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org, Mark Brown Subject: [PATCH] arm64: cpufeature: Enable Qualcomm erratas Date: Mon, 28 Oct 2019 23:04:32 -0700 Message-Id: <20191029060432.1208859-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org With the introduction of 'cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")' the Qualcomm erratas are 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 both 1003 and 1009 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 --- arch/arm64/kernel/cpu_errata.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.23.0 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index df9465120e2f..cdd8df033536 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -780,6 +780,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003", .capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003, + .type = ARM64_CPUCAP_SCOPE_LOCAL_CPU, .matches = cpucap_multi_entry_cap_matches, .match_list = qcom_erratum_1003_list, }, @@ -788,6 +789,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Qualcomm erratum 1009, ARM erratum 1286807", .capability = ARM64_WORKAROUND_REPEAT_TLBI, + .type = ARM64_CPUCAP_SCOPE_LOCAL_CPU, ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus), }, #endif