From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: "Thierry Reding" <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Jonathan Hunter" <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Peter De Schrijver" <pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Rafael J. Wysocki" <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org>, "Daniel Lezcano" <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, "Michał Mirosław" <mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org>, "Jasper Korten" <jja2000-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "David Heidelberg" <david-W22tF5X+A20@public.gmane.org>, "Peter Geis" <pgwipeout-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Nicolas Chauvet" <kwizart-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH v11 04/17] ARM: tegra: Change tegra_set_cpu_in_lp2() type to void Date: Tue, 25 Feb 2020 01:40:44 +0300 [thread overview] Message-ID: <20200224224057.21877-5-digetx@gmail.com> (raw) In-Reply-To: <20200224224057.21877-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> The Tegra30 CPUIDLE driver has intention to check whether primary CPU was the last CPU that entered LP2 (CC6) idle-state, but that functionality never got utilized because driver never supported the CC6 state for the case where any secondary CPU is online. The new cpuidle driver will properly support CC6 on Tegra30, including the case where secondary CPUs are online, and that knowledge about what CPUs entered into CC6 won't be needed at all because new driver will use different approach by making use of the coupled idle-state and explicitly parking secondary CPUs before entering into CC6. Thus this patch is just a minor cleanup change. Acked-by: Peter De Schrijver <pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Tested-by: Peter Geis <pgwipeout-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Tested-by: Jasper Korten <jja2000-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Tested-by: David Heidelberg <david-W22tF5X+A20@public.gmane.org> Tested-by: Nicolas Chauvet <kwizart-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Acked-by: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- arch/arm/mach-tegra/cpuidle-tegra30.c | 14 ++++---------- arch/arm/mach-tegra/pm.c | 8 +------- arch/arm/mach-tegra/pm.h | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c index c6128526877d..a3ce8dabfe18 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/arch/arm/mach-tegra/cpuidle-tegra30.c @@ -98,22 +98,16 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, int index) { bool entered_lp2 = false; - bool last_cpu; local_fiq_disable(); - last_cpu = tegra_set_cpu_in_lp2(); + tegra_set_cpu_in_lp2(); cpu_pm_enter(); - if (dev->cpu == 0) { - if (last_cpu) - entered_lp2 = tegra30_cpu_cluster_power_down(dev, drv, - index); - else - cpu_do_idle(); - } else { + if (dev->cpu == 0) + entered_lp2 = tegra30_cpu_cluster_power_down(dev, drv, index); + else entered_lp2 = tegra30_cpu_core_power_down(dev, drv, index); - } cpu_pm_exit(); tegra_clear_cpu_in_lp2(); diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 1ff499068bb1..a72f9a2d3cb7 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -123,11 +123,9 @@ void tegra_clear_cpu_in_lp2(void) spin_unlock(&tegra_lp2_lock); } -bool tegra_set_cpu_in_lp2(void) +void tegra_set_cpu_in_lp2(void) { int phy_cpu_id = cpu_logical_map(smp_processor_id()); - bool last_cpu = false; - cpumask_t *cpu_lp2_mask = tegra_cpu_lp2_mask; u32 *cpu_in_lp2 = tegra_cpu_lp2_mask; spin_lock(&tegra_lp2_lock); @@ -135,11 +133,7 @@ bool tegra_set_cpu_in_lp2(void) BUG_ON((*cpu_in_lp2 & BIT(phy_cpu_id))); *cpu_in_lp2 |= BIT(phy_cpu_id); - if ((phy_cpu_id == 0) && cpumask_equal(cpu_lp2_mask, cpu_online_mask)) - last_cpu = true; - spin_unlock(&tegra_lp2_lock); - return last_cpu; } static int tegra_sleep_cpu(unsigned long v2p) diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index b9cc12222bb1..2c294f6365c0 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -24,7 +24,7 @@ void tegra30_lp1_iram_hook(void); void tegra30_sleep_core_init(void); void tegra_clear_cpu_in_lp2(void); -bool tegra_set_cpu_in_lp2(void); +void tegra_set_cpu_in_lp2(void); void tegra_idle_lp2_last(void); extern void (*tegra_tear_down_cpu)(void); -- 2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com> To: "Thierry Reding" <thierry.reding@gmail.com>, "Jonathan Hunter" <jonathanh@nvidia.com>, "Peter De Schrijver" <pdeschrijver@nvidia.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, "Daniel Lezcano" <daniel.lezcano@linaro.org>, "Michał Mirosław" <mirq-linux@rere.qmqm.pl>, "Jasper Korten" <jja2000@gmail.com>, "David Heidelberg" <david@ixit.cz>, "Peter Geis" <pgwipeout@gmail.com>, "Nicolas Chauvet" <kwizart@gmail.com> Cc: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 04/17] ARM: tegra: Change tegra_set_cpu_in_lp2() type to void Date: Tue, 25 Feb 2020 01:40:44 +0300 [thread overview] Message-ID: <20200224224057.21877-5-digetx@gmail.com> (raw) In-Reply-To: <20200224224057.21877-1-digetx@gmail.com> The Tegra30 CPUIDLE driver has intention to check whether primary CPU was the last CPU that entered LP2 (CC6) idle-state, but that functionality never got utilized because driver never supported the CC6 state for the case where any secondary CPU is online. The new cpuidle driver will properly support CC6 on Tegra30, including the case where secondary CPUs are online, and that knowledge about what CPUs entered into CC6 won't be needed at all because new driver will use different approach by making use of the coupled idle-state and explicitly parking secondary CPUs before entering into CC6. Thus this patch is just a minor cleanup change. Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com> Tested-by: Peter Geis <pgwipeout@gmail.com> Tested-by: Jasper Korten <jja2000@gmail.com> Tested-by: David Heidelberg <david@ixit.cz> Tested-by: Nicolas Chauvet <kwizart@gmail.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- arch/arm/mach-tegra/cpuidle-tegra30.c | 14 ++++---------- arch/arm/mach-tegra/pm.c | 8 +------- arch/arm/mach-tegra/pm.h | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c index c6128526877d..a3ce8dabfe18 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/arch/arm/mach-tegra/cpuidle-tegra30.c @@ -98,22 +98,16 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, int index) { bool entered_lp2 = false; - bool last_cpu; local_fiq_disable(); - last_cpu = tegra_set_cpu_in_lp2(); + tegra_set_cpu_in_lp2(); cpu_pm_enter(); - if (dev->cpu == 0) { - if (last_cpu) - entered_lp2 = tegra30_cpu_cluster_power_down(dev, drv, - index); - else - cpu_do_idle(); - } else { + if (dev->cpu == 0) + entered_lp2 = tegra30_cpu_cluster_power_down(dev, drv, index); + else entered_lp2 = tegra30_cpu_core_power_down(dev, drv, index); - } cpu_pm_exit(); tegra_clear_cpu_in_lp2(); diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 1ff499068bb1..a72f9a2d3cb7 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -123,11 +123,9 @@ void tegra_clear_cpu_in_lp2(void) spin_unlock(&tegra_lp2_lock); } -bool tegra_set_cpu_in_lp2(void) +void tegra_set_cpu_in_lp2(void) { int phy_cpu_id = cpu_logical_map(smp_processor_id()); - bool last_cpu = false; - cpumask_t *cpu_lp2_mask = tegra_cpu_lp2_mask; u32 *cpu_in_lp2 = tegra_cpu_lp2_mask; spin_lock(&tegra_lp2_lock); @@ -135,11 +133,7 @@ bool tegra_set_cpu_in_lp2(void) BUG_ON((*cpu_in_lp2 & BIT(phy_cpu_id))); *cpu_in_lp2 |= BIT(phy_cpu_id); - if ((phy_cpu_id == 0) && cpumask_equal(cpu_lp2_mask, cpu_online_mask)) - last_cpu = true; - spin_unlock(&tegra_lp2_lock); - return last_cpu; } static int tegra_sleep_cpu(unsigned long v2p) diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index b9cc12222bb1..2c294f6365c0 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -24,7 +24,7 @@ void tegra30_lp1_iram_hook(void); void tegra30_sleep_core_init(void); void tegra_clear_cpu_in_lp2(void); -bool tegra_set_cpu_in_lp2(void); +void tegra_set_cpu_in_lp2(void); void tegra_idle_lp2_last(void); extern void (*tegra_tear_down_cpu)(void); -- 2.24.0
next prev parent reply other threads:[~2020-02-24 22:40 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-24 22:40 [PATCH v11 00/17] Consolidate and improve NVIDIA Tegra CPUIDLE driver(s) Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 02/17] ARM: tegra: Add tegra_pm_park_secondary_cpu() Dmitry Osipenko [not found] ` <20200224224057.21877-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-02-24 22:40 ` [PATCH v11 01/17] ARM: tegra: Compile sleep-tegra20/30.S unconditionally Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 03/17] ARM: tegra: Remove pen-locking from cpuidle-tegra20 Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko [this message] 2020-02-24 22:40 ` [PATCH v11 04/17] ARM: tegra: Change tegra_set_cpu_in_lp2() type to void Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 05/17] ARM: tegra: Propagate error from tegra_idle_lp2_last() Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 09/17] arm: tegra20: cpuidle: Handle case where secondary CPU hangs on entering LP2 Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 10/17] arm: tegra20: cpuidle: Make abort_flag atomic Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 11/17] arm: tegra20/30: cpuidle: Remove unnecessary memory barrier Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 12/17] cpuidle: Refactor and move out NVIDIA Tegra20 driver into drivers/cpuidle Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko [not found] ` <20200224224057.21877-13-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-02-27 9:20 ` Daniel Lezcano 2020-02-27 9:20 ` Daniel Lezcano 2020-02-24 22:40 ` [PATCH v11 13/17] cpuidle: tegra: Squash Tegra30 driver into the common driver Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 14/17] cpuidle: tegra: Squash Tegra114 " Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko [not found] ` <20200224224057.21877-15-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-02-27 9:21 ` Daniel Lezcano 2020-02-27 9:21 ` Daniel Lezcano [not found] ` <dcf45352-8ea3-6273-b4e8-0142f5d5e9f2-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2020-02-27 16:45 ` Dmitry Osipenko 2020-02-27 16:45 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 15/17] cpuidle: tegra: Disable CC6 state if LP2 unavailable Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 17/17] ARM: tegra: Enable Tegra cpuidle driver in tegra_defconfig Dmitry Osipenko 2020-02-24 22:40 ` Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 06/17] ARM: tegra: Expose PM functions required for new cpuidle driver Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 07/17] ARM: tegra: Rename some of the newly exposed PM functions Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 08/17] ARM: tegra: Make outer_disable() open-coded Dmitry Osipenko 2020-02-24 22:40 ` [PATCH v11 16/17] ARM: multi_v7_defconfig: Enable Tegra cpuidle driver Dmitry Osipenko
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=20200224224057.21877-5-digetx@gmail.com \ --to=digetx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=david-W22tF5X+A20@public.gmane.org \ --cc=jja2000-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=kwizart-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org \ --cc=pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=pgwipeout-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org \ --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ /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.