From: Marek Szyprowski <m.szyprowski@samsung.com> To: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski <m.szyprowski@samsung.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Krzysztof Kozlowski <krzk@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Lukasz Luba <lukasz.luba@arm.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Subject: [PATCH 1/4] ARM: exynos: Apply little core workaround only under secure firmware Date: Tue, 16 Jun 2020 10:12:27 +0200 [thread overview] Message-ID: <20200616081230.31198-2-m.szyprowski@samsung.com> (raw) In-Reply-To: <20200616081230.31198-1-m.szyprowski@samsung.com> The additional soft-reset call during little core power up was needed 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: 833b 5794 e330 ("ARM: EXYNOS: reset Little cores when cpu is up") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/mach-exynos/mcpm-exynos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 9a681b421ae1..cd861c57d5ad 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 -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Marek Szyprowski <m.szyprowski@samsung.com> To: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Krzysztof Kozlowski <krzk@kernel.org>, Lukasz Luba <lukasz.luba@arm.com>, Marek Szyprowski <m.szyprowski@samsung.com> Subject: [PATCH 1/4] ARM: exynos: Apply little core workaround only under secure firmware Date: Tue, 16 Jun 2020 10:12:27 +0200 [thread overview] Message-ID: <20200616081230.31198-2-m.szyprowski@samsung.com> (raw) In-Reply-To: <20200616081230.31198-1-m.szyprowski@samsung.com> The additional soft-reset call during little core power up was needed 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: 833b 5794 e330 ("ARM: EXYNOS: reset Little cores when cpu is up") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/mach-exynos/mcpm-exynos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 9a681b421ae1..cd861c57d5ad 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 -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-06-16 8:12 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20200616081248eucas1p168faa343ce333a28c8fd3cf9a6a58b3c@eucas1p1.samsung.com> 2020-06-16 8:12 ` [PATCH 0/4] Restore big.LITTLE cpuidle driver for Exynos Marek Szyprowski 2020-06-16 8:12 ` Marek Szyprowski [not found] ` <CGME20200616081249eucas1p151a8892ca0abfa3108955e1fc5054fc3@eucas1p1.samsung.com> 2020-06-16 8:12 ` Marek Szyprowski [this message] 2020-06-16 8:12 ` [PATCH 1/4] ARM: exynos: Apply little core workaround only under secure firmware Marek Szyprowski 2020-06-17 16:26 ` Lukasz Luba 2020-06-17 16:26 ` Lukasz Luba 2020-06-22 17:19 ` Krzysztof Kozlowski 2020-06-29 8:54 ` Marek Szyprowski 2020-06-29 8:54 ` Marek Szyprowski 2020-06-29 9:13 ` Krzysztof Kozlowski 2020-06-29 9:13 ` Krzysztof Kozlowski [not found] ` <CGME20200629100230eucas1p1bf07ca4c84ba6be1fbdd80c45d077518@eucas1p1.samsung.com> 2020-06-29 10:02 ` [PATCH v2 1/4] ARM: exynos: MCPM: Restore big.LITTLE cpuidle support Marek Szyprowski 2020-06-29 10:02 ` Marek Szyprowski 2020-06-29 11:05 ` Lukasz Luba 2020-06-29 11:05 ` Lukasz Luba 2020-06-29 18:28 ` Krzysztof Kozlowski 2020-06-29 18:28 ` Krzysztof Kozlowski [not found] ` <CGME20200616081249eucas1p2ad165b545f265bec88a06270d55fce76@eucas1p2.samsung.com> 2020-06-16 8:12 ` [PATCH 2/4] cpuidle: big.LITTLE: enable driver only on Peach-Pit/Pi Chromebooks Marek Szyprowski 2020-06-16 8:12 ` Marek Szyprowski 2020-06-22 17:19 ` Krzysztof Kozlowski 2020-06-24 10:05 ` Bartlomiej Zolnierkiewicz 2020-06-24 10:05 ` Bartlomiej Zolnierkiewicz 2020-08-17 15:39 ` Krzysztof Kozlowski 2020-08-17 15:39 ` Krzysztof Kozlowski 2020-08-24 8:15 ` Daniel Lezcano 2020-08-24 8:15 ` Daniel Lezcano 2020-08-24 8:26 ` Krzysztof Kozlowski 2020-08-24 8:26 ` Krzysztof Kozlowski 2020-08-24 9:14 ` Daniel Lezcano 2020-08-24 9:14 ` Daniel Lezcano [not found] ` <CGME20200616081250eucas1p2de7110898dad050866d78cb5d5120422@eucas1p2.samsung.com> 2020-06-16 8:12 ` [PATCH 3/4] ARM: exynos_defconfig: Enable big.LITTLE cpuidle driver Marek Szyprowski 2020-06-16 8:12 ` Marek Szyprowski 2020-06-22 17:20 ` Krzysztof Kozlowski 2020-06-29 11:35 ` Marek Szyprowski 2020-06-29 11:35 ` Marek Szyprowski 2020-06-24 10:06 ` Bartlomiej Zolnierkiewicz 2020-06-24 10:06 ` Bartlomiej Zolnierkiewicz [not found] ` <CGME20200616081250eucas1p2a98f8810962ddc692fa5588a74f911b3@eucas1p2.samsung.com> 2020-06-16 8:12 ` [PATCH 4/4] ARM: multi_v7_defconfig: " Marek Szyprowski 2020-06-16 8:12 ` Marek Szyprowski 2020-06-24 10:06 ` Bartlomiej Zolnierkiewicz 2020-06-24 10:06 ` Bartlomiej Zolnierkiewicz 2020-06-16 20:58 ` [PATCH 0/4] Restore big.LITTLE cpuidle driver for Exynos Anand Moon 2020-06-16 20:58 ` Anand Moon 2020-06-17 9:48 ` Marek Szyprowski 2020-06-17 9:48 ` Marek Szyprowski 2020-06-17 10:40 ` Lukasz Luba 2020-06-17 10:40 ` Lukasz Luba 2020-06-17 10:57 ` Anand Moon 2020-06-17 10:57 ` Anand Moon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200616081230.31198-2-m.szyprowski@samsung.com \ --to=m.szyprowski@samsung.com \ --cc=b.zolnierkie@samsung.com \ --cc=daniel.lezcano@linaro.org \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=lukasz.luba@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.