diff options
| author | Hyung Taek Ryoo <hryoo@nvidia.com> | 2013-01-10 15:42:16 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:57:07 -0700 |
| commit | 49aa0d74d4e5fbf333a2619ca8aa1d362589c32b (patch) | |
| tree | d6a1fe65c08fa2280da505d84f99c6bc2070cd77 /arch/arm/mach-tegra/sleep.S | |
| parent | 70fd29cc2c4c16ebe7cae803618852e117cb917a (diff) | |
secureos: tegra: Remove duplicated L2 cache flush
This change removes deplicated L2 cache flush.
Moves SMC(0xFFFFFFE4) a bit later in the PM entry process,
replacing tegra_flush_cache in tegra_sleep_cpu_finish().
Bug 1195365
(cherry picked from commit aded133982f0d54e0be3446b8d15c185aa352aac)
Reviewed-on: http://git-master/r/#change,190431
Change-Id: I876ad1d8322f571d7c8561cea83bbf22915d01d8
Signed-off-by: Hyung Taek Ryoo <hryoo@nvidia.com>
Reviewed-on: http://git-master/r/190451
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 3892448f5f32..48d2be0a8bee 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -212,7 +212,15 @@ ENDPROC(tegra_flush_l1_cache) */ ENTRY(tegra_sleep_cpu_finish) mov r4, r0 +#ifdef CONFIG_TRUSTED_FOUNDATIONS + ldr r0, =0xFFFFFFFC + ldr r1, =0xFFFFFFE4 + ldr r2, =TEGRA_RESET_HANDLER_BASE + bl tegra_generic_smc +#else bl tegra_flush_cache +#endif + mov r0, r4 bl tegra_cpu_exit_coherency |