From patchwork Mon Aug 17 15:09:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247874 Delivered-To: patch@linaro.org Received: by 2002:a54:3b12:0:0:0:0:0 with SMTP id j18csp2598518ect; Mon, 17 Aug 2020 12:47:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZGmIodexRJK/0fJMwnSZD/bwQZ8BvCYcYFst0S7F2iIMRHPYZ0vh3VZ8+ncgEurerW1b0 X-Received: by 2002:a05:6402:748:: with SMTP id p8mr17175565edy.305.1597693653404; Mon, 17 Aug 2020 12:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597693653; cv=none; d=google.com; s=arc-20160816; b=BhgvnCUG/T7iSbn5kUwUjbBzeS1lCNQuV0DyRUGUB2rMS/58zWfu65qgUTuW3OQF6N yJSWdI0Zn0DP5eECCY5leDLisWppC218GgkCvVj0rCKqEHM/a2HSDD5SFtd9v7Jh60Vb 3U9mdw90AO6Gddd5Aert+Da1Pfdb/uHQpCK+amiFzEzWg0PkKA/X3XqoAZDWNYbMQTXR DG71TPx809rCsEq10otFoX2c5Wzuz9xUEyKWVJF445VOFLrerRNo1bwdVsG5C/1C0eLx JlCnM5Mcd9NxrEuM6JiUK3EdZTQjCTfef1n0peXAtyyaQ4gRJFviO1Uhk9+4I+yZl9qf xDdA== 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=Yln1F4rIr8ogpdRHF1h89d5sp39AFayDn3GpWJG0kd2xQMP+ARXea/QZVvh+LzgwRy IXISa8ssbwlpQWIdBjIAyyW1UymKotgT0Li5i9aWRVN8uSqv2uq/7T+mVvMdQ5QU25PC YIxemN7S+cKmKCZlr18SNHNv5Dt6yoCwg8aovX7HMubgoqJP2IO2lXd/Zo0+dkXMKxbG INESnBXsJD+8ZT1Os+GtC9yFEcRFohoLx21EbYddl8qlc5p7AOMGhjz1wIa+yGOo10Pk 6NlinL5KcgpnxNRk3PfYdhXIiFQ51LcW6ABOz0iHwGzObgs31nXVCaHVrQFu3YlDqPcS RFGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XtsR1JUM; 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 oo19si11600065ejb.420.2020.08.17.12.47.33; Mon, 17 Aug 2020 12:47:33 -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=XtsR1JUM; 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 S1729572AbgHQTrc (ORCPT + 15 others); Mon, 17 Aug 2020 15:47:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:42480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729284AbgHQPUi (ORCPT ); Mon, 17 Aug 2020 11:20:38 -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 3AF22207D3; Mon, 17 Aug 2020 15:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677637; bh=drw5bpymsEmzse0AQE94EHwiijtRpGBgXRZNsFvsyBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XtsR1JUMNT499cD2twGshw68ZqI/6QZrpE+HKihyXOjS+maSgafJH7KKts+wcgcye hZ5SqhAXwByrTTaGekmFfmVHRJHc7RRy/BGheohTl6t5ABZ8kQYu7mLucW7q9Sv9x8 qK8+FUx07WlJuVvLAmTJKNfzfrUEgfAZYvmXksrU= 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.8 024/464] ARM: exynos: MCPM: Restore big.LITTLE cpuidle support Date: Mon, 17 Aug 2020 17:09:37 +0200 Message-Id: <20200817143834.914697956@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@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