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
This commit is contained in:
commit
33b0c79205
|
@ -40,7 +40,7 @@
|
||||||
#define PLATFORM_STACK_SIZE U(0x400)
|
#define PLATFORM_STACK_SIZE U(0x400)
|
||||||
#endif
|
#endif
|
||||||
#elif IMAGE_BL31
|
#elif IMAGE_BL31
|
||||||
#define PLATFORM_STACK_SIZE U(0x400)
|
#define PLATFORM_STACK_SIZE U(0x800)
|
||||||
#elif IMAGE_BL32
|
#elif IMAGE_BL32
|
||||||
#define PLATFORM_STACK_SIZE U(0x440)
|
#define PLATFORM_STACK_SIZE U(0x440)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -178,19 +178,22 @@ static void __dead2 rcar_system_off(void)
|
||||||
ERROR("BL3-1:Failed the SYSTEM-RESET.\n");
|
ERROR("BL3-1:Failed the SYSTEM-RESET.\n");
|
||||||
#endif
|
#endif
|
||||||
#else
|
#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;
|
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();
|
panic();
|
||||||
|
}
|
||||||
|
|
||||||
if (rtn_on)
|
if (rtn_on != 0) {
|
||||||
panic();
|
panic();
|
||||||
|
}
|
||||||
|
|
||||||
rcar_pwrc_cpuoff(cpu);
|
rcar_pwrc_cpuoff(mpidr);
|
||||||
rcar_pwrc_clusteroff(cpu);
|
rcar_pwrc_clusteroff(mpidr);
|
||||||
|
|
||||||
#endif /* PMIC_ROHM_BD9571 */
|
#endif /* PMIC_ROHM_BD9571 */
|
||||||
wfi();
|
wfi();
|
||||||
|
|
Loading…
Reference in New Issue