From patchwork Mon Aug 17 15:11:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247807 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2741717ilo; Mon, 17 Aug 2020 08:43:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOCED3OW677A7ANZKRBe4tYADVELH9j/+KHfD2GTc8cVlPCBdQ2ThbdWlk1DPTGUv0cYPR X-Received: by 2002:aa7:d607:: with SMTP id c7mr15338314edr.184.1597679005345; Mon, 17 Aug 2020 08:43:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597679005; cv=none; d=google.com; s=arc-20160816; b=h+vW8pP/cpERKaZU6QgBNdv6tPV90ySDgdyRe7e3UgmgbxjLWxFH3fg7gN1uhWgmvu tozQXtZonjKH3/f9LMs65HDhrOg9o8jkDZFPD7GZ/ZCf174a7bbej1fnTw8LC8I9OQai vWSo3IVqzcDCOeHAwxCFFcW6xvHw9piiDUdY+d5A71hQJzibbxI99gnl5+iISZ2Q1cLP z+YEQmHkkVaqD/1fhlRcqgwx6R1yORRLPsKKzyNcD9I/N4K3X/q0uATQ7es3T2u6zS/l 1Cf44MKX1n/5DPTR0UUvp4SJYBeSkafivL8xLnPO+V4H+oTQlyuSBZxFz0n3MkK2Atjz UD5A== 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=nD5aRyLapCYKG0q0Ukf5EQrYIQWwhykCl0u72Wp1UWI=; b=YQ1v7FqZagphFoQ/K+9R+txMDrVlBCYNAidfoMK5alMlMzgTomeuN03lOlGYb7Ww4e /5xq8eBGeV6qYVq9NFHQBvzQYkRgx0MKg+2XEYvq2giqvDrGu+37BRjHJFHnUgiTgkG4 HKCVGQ9lNr0ZSCnxgO9f3uuXYJbC9kBZwkKnyPzvluFtjZXUETfxAASKHlk+Z9nPeW/h cPXdMlSqFvz6VVm97YVE2Q6sWblRYELu+eFpD/ZhKGYI8YSKuArgqa3lWbWHM3+pmDmv GZzABcRGlT2RnAjnv4HM13navCUm1cT1JKKjiyIaujErX3hwapHIux9x6idZwoZMAcsI WBpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RQTgC8D+; 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=fail (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 bs9si11423695edb.396.2020.08.17.08.43.25; Mon, 17 Aug 2020 08:43:25 -0700 (PDT) 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=@kernel.org header.s=default header.b=RQTgC8D+; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387639AbgHQPnY (ORCPT + 15 others); Mon, 17 Aug 2020 11:43:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:53652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387633AbgHQPnT (ORCPT ); Mon, 17 Aug 2020 11:43:19 -0400 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 22EA322CAD; Mon, 17 Aug 2020 15:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678998; bh=drw5bpymsEmzse0AQE94EHwiijtRpGBgXRZNsFvsyBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQTgC8D+5BfcEjvPEtQhQGCo94WoI66iufiKH7AoqOTypFkXiHiuLactVa9Ev3ZJE lJY0J3cXmXL1mGg4ILVyc+aEGp4dAPYFjz4lsRBM6LanyOwpqTdgFwS2m8kb3W2lqR xpkTncWNrc8+e6KN4F85NBDaPJaGP0cq75Wfc/Qg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Lukasz Luba , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 5.7 021/393] ARM: exynos: MCPM: Restore big.LITTLE cpuidle support Date: Mon, 17 Aug 2020 17:11:11 +0200 Message-Id: <20200817143820.622086517@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@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: Marek Szyprowski [ Upstream commit ea9dd8f61c8a890843f68e8dc0062ce78365aab8 ] Call exynos_cpu_power_up(cpunr) unconditionally. This is needed by the big.LITTLE cpuidle driver and has no side-effects on other code paths. The additional soft-reset call during little core power up has been added to properly boot all cores on the Exynos5422-based boards with secure firmware (like Odroid XU3/XU4 family). This however broke big.LITTLE CPUidle driver, which worked only on boards without secure firmware (like Peach-Pit/Pi Chromebooks). Apply the workaround only when board is running under secure firmware. Fixes: 833b5794e330 ("ARM: EXYNOS: reset Little cores when cpu is up") Signed-off-by: Marek Szyprowski Reviewed-by: Lukasz Luba Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/mach-exynos/mcpm-exynos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 9a681b421ae11..cd861c57d5adf 100644 --- a/arch/arm/mach-exynos/mcpm-exynos.c +++ b/arch/arm/mach-exynos/mcpm-exynos.c @@ -26,6 +26,7 @@ #define EXYNOS5420_USE_L2_COMMON_UP_STATE BIT(30) static void __iomem *ns_sram_base_addr __ro_after_init; +static bool secure_firmware __ro_after_init; /* * The common v7_exit_coherency_flush API could not be used because of the @@ -58,15 +59,16 @@ static void __iomem *ns_sram_base_addr __ro_after_init; static int exynos_cpu_powerup(unsigned int cpu, unsigned int cluster) { unsigned int cpunr = cpu + (cluster * EXYNOS5420_CPUS_PER_CLUSTER); + bool state; pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); if (cpu >= EXYNOS5420_CPUS_PER_CLUSTER || cluster >= EXYNOS5420_NR_CLUSTERS) return -EINVAL; - if (!exynos_cpu_power_state(cpunr)) { - exynos_cpu_power_up(cpunr); - + state = exynos_cpu_power_state(cpunr); + exynos_cpu_power_up(cpunr); + if (!state && secure_firmware) { /* * This assumes the cluster number of the big cores(Cortex A15) * is 0 and the Little cores(Cortex A7) is 1. @@ -258,6 +260,8 @@ static int __init exynos_mcpm_init(void) return -ENOMEM; } + secure_firmware = exynos_secure_firmware_available(); + /* * To increase the stability of KFC reset we need to program * the PMU SPARE3 register