security: tf_driver: integrate latest TL release
Martin Chi [Thu, 2 Jan 2014 05:54:12 +0000 (13:54 +0800)]
Tegra4 version: TF_TEGRA4_AC02.08p6.40683
This version fixes LP1 wakeup sequence.
The major problem was introduced by mistake in release 2.0.8p4.
Synchronized SDRAM wakeup sequence in TF with the latest BSP.
The other features are preserved unchanged.

Bug 1363940
Bug 1380505

Change-Id: Ieb3a089f5f5a964186ad11b691acc254b4216f9d
Signed-off-by: Martin Chi <mchi@nvidia.com>
Reviewed-on: http://git-master/r/351176
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit

arch/arm/mach-tegra/sleep-t3.S
security/tf_driver/s_version.h

index c1b02ca..a3ddefc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/include/mach/sleep-t3.S
  *
- * Copyright (c) 2010-2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2010-2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -454,6 +454,8 @@ ENTRY(tegra3_lp1_reset)
        str     r1, [r0, #CLK_RESET_CCLK_DIVIDER]
 #endif
 
+#ifndef CONFIG_TRUSTED_FOUNDATIONS
+
 #if defined(CONFIG_ARCH_TEGRA_3x_SOC)
        /* enable PLLM via PMC */
        mov32   r2, TEGRA_PMC_BASE
@@ -510,6 +512,16 @@ ENTRY(tegra3_lp1_reset)
        mov     r4, #(1 << 27)
        str     r4, [r0, #CLK_RESET_CLK_ENB_W_SET]
 #endif
+#else  /* ifndef CONFIG_TRUSTED_FOUNDATIONS */
+       mov32   r2, TEGRA_PMC_BASE
+#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+       add     r5, pc, #tegra3_sdram_pad_save-(.+8)    @ r5 --> saved data
+#endif
+#if defined(CONFIG_ARCH_TEGRA_11x_SOC)
+       add     r5, pc, #tegra11_sdram_pad_save-(.+8)   @ r5 --> saved data
+#endif
+#endif /* ifndef CONFIG_TRUSTED_FOUNDATIONS */
+
        /* Restore the Core voltage back to high */
        set_voltage r1, r4, r3, r0, lp1_register_core_highvolt
 
@@ -550,6 +562,8 @@ powerup_l2_done:
        str     r0, [r2, #PMC_REMOVE_CLAMPING_CMD]
 #endif
 
+#ifndef CONFIG_TRUSTED_FOUNDATIONS
+
 #if defined(CONFIG_ARCH_TEGRA_3x_SOC)
        mov32   r0, TEGRA_EMC_BASE              @ r0 reserved for emc base
 #endif
@@ -671,6 +685,8 @@ zcal_done:
        addne   r5, r5, #0x20
        bne     exit_self_refresh
 #endif
+#endif /* ifndef CONFIG_TRUSTED_FOUNDATIONS */
+
        mov32   r0, TEGRA_PMC_BASE
        ldr     r0, [r0, #PMC_SCRATCH41]
        mov     pc, r0
index e2d41b0..a84d1c8 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (c) 2011 Trusted Logic S.A.
  * All Rights Reserved.
  *
- * Copyright (C) 2011-2013 NVIDIA Corporation.
+ * Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -63,7 +63,7 @@
 #define S_VERSION_PLATFORM "C"
 #define S_VERSION_MAIN  "02.08"
 #define S_VERSION_ENG 0
-#define S_VERSION_PATCH 5
+#define S_VERSION_PATCH 6
 
 #else
 #define S_VERSION_OS "Z"          /* Unknown platform */