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

Merge changes I9405f7f6,Id53ea099 into integration 

* changes:
  fix(plat/mediatek/mt8183): fix out-of-bound access
  feat(plat/mediatek/common): enable software reset for CIRQ
This commit is contained in:
Mark Dykes 2021-10-07 22:28:42 +02:00 committed by TrustedFirmware Code Review
parent ae720acd71 420c26b33a
commit fcfecdaf2e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/mediatek/common/mtk_cirq.c
View File

@ -541,11 +541,9 @@ void mt_cirq_flush(void)
void mt_cirq_sw_reset(void) void mt_cirq_sw_reset(void)
{ {
#ifdef CIRQ_NEED_SW_RESET
uint32_t st; uint32_t st;
st = mmio_read_32(CIRQ_CON); st = mmio_read_32(CIRQ_CON);
st |= (CIRQ_SW_RESET << CIRQ_CON_SW_RST_BITS); st |= (CIRQ_SW_RESET << CIRQ_CON_SW_RST_BITS);
mmio_write_32(CIRQ_CON, st); mmio_write_32(CIRQ_CON, st);
#endif
} }

2
plat/mediatek/mt8183/drivers/sspm/sspm.c
View File

@ -149,7 +149,7 @@ int sspm_alive_show(void)
while (sspm_ipi_recv_non_blocking(IPI_ID_PLATFORM, while (sspm_ipi_recv_non_blocking(IPI_ID_PLATFORM,
&ipi_data, &ipi_data,
sizeof(ipi_data)) sizeof(ipi_data) / sizeof(uint32_t))
&& count) { && count) {
mdelay(100); mdelay(100);
count--; count--;