andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Manish Pandey 2022-01-31 16:53:19 +01:00 committed by TrustedFirmware Code Review
parent 0fc22fcdbd d544dfcc49
commit 33b0c79205
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/renesas/common/include/platform_def.h
View File

@ -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

15
plat/renesas/common/plat_pm.c
View File

@ -178,19 +178,22 @@ static void __dead2 rcar_system_off(void)
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();