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

Merge "fix(smmu): set root port CR0 GPCEN before ACCESSEN" into integration

Browse source
This commit is contained in:
Manish Pandey 2025-01-16 11:12:09 +01:00 • committed by TrustedFirmware Code Review
commit a1ff78f53a
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/arm/smmu/smmu_v3.c
View file

@ -124,22 +124,35 @@ int __init smmuv3_init(uintptr_t smmu_base)
gptbr_el3 << 12);
/*
* ACCESSEN=1: SMMU- and client-originated accesses are
* not terminated by this mechanism.
* GPCEN=1: All clients and SMMU-originated accesses,
* except GPT-walks, are subject to GPC.
*
* It is recommended to set GPCEN and wait for completion
* prior to setting ACCESSEN.
*/
mmio_setbits_32(smmu_base + SMMU_ROOT_CR0,
SMMU_ROOT_CR0_GPCEN);
/* Poll for GPCEN ack bit. */
if (smmuv3_poll(smmu_base + SMMU_ROOT_CR0ACK,
SMMU_ROOT_CR0_GPCEN,
SMMU_ROOT_CR0_GPCEN) != 0) {
WARN("Failed enabling SMMU GPC.\n");
}
/*
* ACCESSEN=1: SMMU- and client-originated accesses are
* not terminated by this mechanism.
*/
mmio_setbits_32(smmu_base + SMMU_ROOT_CR0,
SMMU_ROOT_CR0_GPCEN |
SMMU_ROOT_CR0_ACCESSEN);
/* Poll for ACCESSEN and GPCEN ack bits. */
/* Poll for ACCESSEN ack bit. */
if (smmuv3_poll(smmu_base + SMMU_ROOT_CR0ACK,
SMMU_ROOT_CR0_GPCEN |
SMMU_ROOT_CR0_ACCESSEN,
SMMU_ROOT_CR0_GPCEN |
SMMU_ROOT_CR0_ACCESSEN) != 0) {
WARN("Failed enabling SMMU GPC.\n");
WARN("Failed enabling SMMU ACCESS.\n");
/*
* Do not return in error, but fall back to