diff options
author | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2019-10-31 14:09:52 -0600 |
---|---|---|
committer | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2019-11-01 10:51:07 -0600 |
commit | 620dd58b811efdb22e40d3ec4ddba0883a676b70 (patch) | |
tree | 54ea21dea0de29310ad0fd531dc76e0700713a2c /drivers | |
parent | 5d71d3f624873884a43179aaaafb06cb5a77d507 (diff) | |
download | trusted-firmware-a-620dd58b811efdb22e40d3ec4ddba0883a676b70.tar.gz |
SMMUv3:Changed retry loop to delay timer(GENFW-3329)
Instead of retry polling, timer of 1ms is used to poll
Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
Change-Id: I7e028dc68138d2888e3cf0cbed744f5e6bc6ff42
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/arm/smmu/smmu_v3.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/arm/smmu/smmu_v3.c b/drivers/arm/smmu/smmu_v3.c index 5493b850a9..a082a81074 100644 --- a/drivers/arm/smmu/smmu_v3.c +++ b/drivers/arm/smmu/smmu_v3.c @@ -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; |