CTCaer/switch-l4t-atf
1
0
Fork 0
mirror of https://github.com/CTCaer/switch-l4t-atf.git synced 2024-11-24 02:09:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge changes I9405f7f6,Id53ea099 into integration

Browse Source 
* 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
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)
{
#ifdef CIRQ_NEED_SW_RESET
uint32_t st;
st = mmio_read_32(CIRQ_CON);
st |= (CIRQ_SW_RESET << CIRQ_CON_SW_RST_BITS);
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,
&ipi_data,
sizeof(ipi_data))
sizeof(ipi_data) / sizeof(uint32_t))
&& count) {
mdelay(100);
count--;