diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-11-04 10:06:56 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-11-04 10:06:56 +0000 |
| commit | d69f99815840a9743560d56ce3be0daf9912ca3a (patch) | |
| tree | 2556952d996bc88e37d5bbfbe2374b1b583d9a13 /drivers | |
| parent | 1d2b41614c5675b144ae1f4517c1f8bf249a12d2 (diff) | |
| parent | 620dd58b811efdb22e40d3ec4ddba0883a676b70 (diff) | |
| download | platform_external_arm-trusted-firmware-d69f99815840a9743560d56ce3be0daf9912ca3a.tar.gz platform_external_arm-trusted-firmware-d69f99815840a9743560d56ce3be0daf9912ca3a.tar.bz2 platform_external_arm-trusted-firmware-d69f99815840a9743560d56ce3be0daf9912ca3a.zip | |
Merge "SMMUv3:Changed retry loop to delay timer(GENFW-3329)" into integration
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 5493b850a..a082a8107 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; |