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

Merge "SMMUv3:Changed retry loop to delay timer(GENFW-3329)" into integration

This commit is contained in:
Alexei Fedorov 2019-11-04 10:06:56 +00:00 committed by TrustedFirmware Code Review
parent 1d2b41614c 620dd58b81
commit d69f998158
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/arm/smmu/smmu_v3.c
View File

@ -7,23 +7,27 @@
#include <common/debug.h>
#include <cdefs.h>
#include <drivers/arm/smmu_v3.h>
#include <drivers/delay_timer.h>
#include <lib/mmio.h>
/* SMMU poll number of retries */
#define SMMU_POLL_RETRY 1000000
#define SMMU_POLL_TIMEOUT_US U(1000)
static int __init smmuv3_poll(uintptr_t smmu_reg, uint32_t mask,
uint32_t value)
{
uint32_t reg_val, retries = SMMU_POLL_RETRY;
uint32_t reg_val;
uint64_t timeout;
/* Set 1ms timeout value */
timeout = timeout_init_us(SMMU_POLL_TIMEOUT_US);
do {
reg_val = mmio_read_32(smmu_reg);
if ((reg_val & mask) == value)
return 0;
} while (--retries != 0U);
} while (!timeout_elapsed(timeout));
ERROR("Failed to poll SMMUv3 register @%p\n", (void *)smmu_reg);
ERROR("Timeout polling SMMUv3 register @%p\n", (void *)smmu_reg);
ERROR("Read value 0x%x, expected 0x%x\n", reg_val,
value == 0U ? reg_val & ~mask : reg_val | mask);
return -1;