Merge "fix(drivers/gic600ae_fmu): fix timeout calculation" into integration

This commit is contained in:
Manish Pandey 2021-11-18 15:25:14 +01:00 committed by TrustedFirmware Code Review
commit 7300434afc
1 changed files with 5 additions and 2 deletions

View File

@ -46,17 +46,20 @@
/* Helper function to wait until FMU is ready to accept the next command */ /* Helper function to wait until FMU is ready to accept the next command */
static void wait_until_fmu_is_idle(uintptr_t base) static void wait_until_fmu_is_idle(uintptr_t base)
{ {
uint64_t timeout_ref = timeout_init_us(GICFMU_IDLE_TIMEOUT_US); uint32_t timeout_count = GICFMU_IDLE_TIMEOUT_US;
uint64_t status; uint64_t status;
/* wait until status is 'busy' */ /* wait until status is 'busy' */
do { do {
status = (gic_fmu_read_status(base) & BIT(0)); status = (gic_fmu_read_status(base) & BIT(0));
if (timeout_elapsed(timeout_ref)) { if (timeout_count-- == 0U) {
ERROR("GIC600 AE FMU is not responding\n"); ERROR("GIC600 AE FMU is not responding\n");
panic(); panic();
} }
udelay(1U);
} while (status == U(0)); } while (status == U(0));
} }