Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(intel): update individual return result for hps and fpga bridges

Browse source 
The code is designed to execute SOC2FPGA and LWSOC2FPGA first
then to F2SOC and both sharing the same result "return".
Thus when F2SOC is executed, the "return" result will overwrite
SOC2FPGA "return" result even though it is not enabled.
Using 2 different "return" result to for each bridges and
return both of them at the end of the function to
avoid being overwritten.

Change-Id: Id9de3f416fe3020db35bc946135b175be2a7dc1e
Signed-off-by: Jit Loon Lim <jit.loon.lim@intel.com>
This commit is contained in:
Jit Loon Lim 2023-10-16 07:57:58 +08:00
parent 93823fb6ec
commit 82752c4123
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plat/intel/soc/common/soc/socfpga_reset_manager.c
View file

@ -407,6 +407,7 @@ int socfpga_bridges_reset(uint32_t mask)
int socfpga_bridges_enable(uint32_t mask)
{
int ret = 0;
int ret_hps = 0;
uint32_t brg_mask = 0;
uint32_t noc_mask = 0;
uint32_t f2s_idlereq = 0;
@ -505,9 +506,9 @@ int socfpga_bridges_enable(uint32_t mask)
mmio_clrbits_32(SOCFPGA_RSTMGR(BRGMODRST), brg_mask);
/* Wait until idle ack becomes 0 */
ret = poll_idle_status(SOCFPGA_SYSMGR(NOC_IDLEACK),
ret_hps = poll_idle_status(SOCFPGA_SYSMGR(NOC_IDLEACK),
noc_mask, 0, 300);
if (ret < 0) {
if (ret_hps < 0) {
ERROR("S2F bridge enable: Timeout idle ack\n");
}
}
@ -711,6 +712,7 @@ int socfpga_bridges_enable(uint32_t mask)
udelay(5);
}
#endif
ret = ret | ret_hps;
return ret;
}