AU_LINUX_BASE_QRDK_FIG_QRDK_TARGET_ALL.12.5.699.054

-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQTxBDvDjyiEYwLkeGuhSA9lgKkB8QUCZn7+yAAKCRChSA9lgKkB
 8UcPAJ45onPTd7fN+J/Kiw19tgTAUJSU6ACeJHpioxwI8cCzY4Z68j6YPIBH/uM=
 =yrvg
 -----END PGP SIGNATURE-----

Merge remote-tracking branch origin/AU_LINUX_BASE_QRDK_FIG_QRDK_TARGET_ALL.12.5.699.054 into HEAD

Signed-off-by: Linux Build Service Account <quic_lnxbuild@quicinc.com>
Change-Id: I2d2683f6926efa090b8d84afd2427ed4c09993bc
This commit is contained in:
Linux Build Service Account 2024-07-02 04:06:19 -07:00
commit 3ad45b3ec6

View file

@ -921,8 +921,32 @@ __weak int ipq_get_tz_version(char *version_name, int buf_size)
int ipq_read_tcsr_boot_misc(void)
{
u32 *dmagic = TCSR_BOOT_MISC_REG;
return *dmagic;
u32 dmagic;
int ret;
long feat_avail;
/* The TCSR dload register is protected in latest TZ.
* Old TZ will allow direct read.
* Use the qca_scm_is_feature_available() call to know
* if TZ supports direct or scm read. Based on return
* value, read the TCSR dload register appropriately.
*/
feat_avail = qca_scm_is_feature_available(0x6);
if (feat_avail == 0x401000) {
if (is_scm_armv8()) {
ret = qca_scm_call_read(SCM_SVC_IO, SCM_IO_READ,
TCSR_BOOT_MISC_REG, &dmagic);
if (ret)
return 0;
}
else
return 0;
}
else {
dmagic = *(TCSR_BOOT_MISC_REG);
}
return dmagic;
}
int apps_iscrashed_crashdump_disabled(void)