AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: tegra: Propagate error from tegra_idle_lp2_last()

Browse Source 
Technically cpu_suspend() may fail and it's never good to lose information
about failure. For example things like cpuidle core could correctly sample
idling time in the case of failure.

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>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Dmitry Osipenko 2020-02-25 01:40:45 +03:00 committed by Thierry Reding
parent f5619492c8
commit 891e1286c1
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-tegra/cpuidle-tegra20.c
View File

@ -86,15 +86,17 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
int index) int index)
{ {
bool ret;
while (!tegra_cpu_rail_off_ready()) while (!tegra_cpu_rail_off_ready())
cpu_relax(); cpu_relax();
tegra_idle_lp2_last(); ret = !tegra_idle_lp2_last();
if (cpu_online(1)) if (cpu_online(1))
tegra20_wake_cpu1_from_reset(); tegra20_wake_cpu1_from_reset();
return true; return ret;
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

4
arch/arm/mach-tegra/cpuidle-tegra30.c
View File

@ -68,9 +68,7 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
return false; return false;
} }
tegra_idle_lp2_last(); return !tegra_idle_lp2_last();
return true;
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

8
arch/arm/mach-tegra/pm.c
View File

@ -189,14 +189,16 @@ static void tegra_pm_set(enum tegra_suspend_mode mode)
tegra_pmc_enter_suspend_mode(mode); tegra_pmc_enter_suspend_mode(mode);
} }
void tegra_idle_lp2_last(void) int tegra_idle_lp2_last(void)
{ {
int err;
tegra_pm_set(TEGRA_SUSPEND_LP2); tegra_pm_set(TEGRA_SUSPEND_LP2);
cpu_cluster_pm_enter(); cpu_cluster_pm_enter();
suspend_cpu_complex(); suspend_cpu_complex();
cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, &tegra_sleep_cpu); err = cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, &tegra_sleep_cpu);
/* /*
* Resume L2 cache if it wasn't re-enabled early during resume, * Resume L2 cache if it wasn't re-enabled early during resume,
@ -208,6 +210,8 @@ void tegra_idle_lp2_last(void)
restore_cpu_complex(); restore_cpu_complex();
cpu_cluster_pm_exit(); cpu_cluster_pm_exit();
return err;
} }
enum tegra_suspend_mode tegra_pm_validate_suspend_mode( enum tegra_suspend_mode tegra_pm_validate_suspend_mode(

2
arch/arm/mach-tegra/pm.h
View File

@ -25,7 +25,7 @@ void tegra30_sleep_core_init(void);
void tegra_clear_cpu_in_lp2(void); void tegra_clear_cpu_in_lp2(void);
void tegra_set_cpu_in_lp2(void); void tegra_set_cpu_in_lp2(void);
void tegra_idle_lp2_last(void); int tegra_idle_lp2_last(void);
extern void (*tegra_tear_down_cpu)(void); extern void (*tegra_tear_down_cpu)(void);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP