Merge changes I25047322,Id476f815 into integration
* changes:
fix(plat/rcar3): change stack size of BL31
fix(plat/rcar3): fix SYSTEM_OFF processing for R-Car D3
diff --git a/plat/renesas/common/include/platform_def.h b/plat/renesas/common/include/platform_def.h
index 1213a3c..ab071ec 100644
--- a/plat/renesas/common/include/platform_def.h
+++ b/plat/renesas/common/include/platform_def.h
@@ -40,7 +40,7 @@
#define PLATFORM_STACK_SIZE U(0x400)
#endif
#elif IMAGE_BL31
-#define PLATFORM_STACK_SIZE U(0x400)
+#define PLATFORM_STACK_SIZE U(0x800)
#elif IMAGE_BL32
#define PLATFORM_STACK_SIZE U(0x440)
#endif
diff --git a/plat/renesas/common/plat_pm.c b/plat/renesas/common/plat_pm.c
index cc677f3..9810596 100644
--- a/plat/renesas/common/plat_pm.c
+++ b/plat/renesas/common/plat_pm.c
@@ -178,19 +178,22 @@
ERROR("BL3-1:Failed the SYSTEM-RESET.\n");
#endif
#else
- u_register_t cpu = read_mpidr_el1() & 0x0000ffffU;
+ u_register_t mpidr = read_mpidr_el1();
+ u_register_t cpu = mpidr & 0x0000ffffU;
int32_t rtn_on;
- rtn_on = rcar_pwrc_cpu_on_check(cpu);
+ rtn_on = rcar_pwrc_cpu_on_check(mpidr);
- if (cpu == rcar_boot_mpidr)
+ if (cpu != rcar_boot_mpidr) {
panic();
+ }
- if (rtn_on)
+ if (rtn_on != 0) {
panic();
+ }
- rcar_pwrc_cpuoff(cpu);
- rcar_pwrc_clusteroff(cpu);
+ rcar_pwrc_cpuoff(mpidr);
+ rcar_pwrc_clusteroff(mpidr);
#endif /* PMIC_ROHM_BD9571 */
wfi();