diff options
Diffstat (limited to 'drivers/st/reset/stm32mp1_reset.c')
-rw-r--r-- | drivers/st/reset/stm32mp1_reset.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/drivers/st/reset/stm32mp1_reset.c b/drivers/st/reset/stm32mp1_reset.c index fd3f93e017..98c8dcf710 100644 --- a/drivers/st/reset/stm32mp1_reset.c +++ b/drivers/st/reset/stm32mp1_reset.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <errno.h> #include <limits.h> #include <platform_def.h> @@ -15,8 +16,6 @@ #include <lib/mmio.h> #include <lib/utils_def.h> -#define RESET_TIMEOUT_US_1MS U(1000) - static uint32_t id2reg_offset(unsigned int reset_id) { return ((reset_id & GENMASK(31, 5)) >> 5) * sizeof(uint32_t); @@ -27,36 +26,44 @@ static uint8_t id2reg_bit_pos(unsigned int reset_id) return (uint8_t)(reset_id & GENMASK(4, 0)); } -void stm32mp_reset_assert(uint32_t id) +int stm32mp_reset_assert(uint32_t id, unsigned int to_us) { uint32_t offset = id2reg_offset(id); uint32_t bitmsk = BIT(id2reg_bit_pos(id)); - uint64_t timeout_ref; uintptr_t rcc_base = stm32mp_rcc_base(); mmio_write_32(rcc_base + offset, bitmsk); - timeout_ref = timeout_init_us(RESET_TIMEOUT_US_1MS); - while ((mmio_read_32(rcc_base + offset) & bitmsk) == 0U) { - if (timeout_elapsed(timeout_ref)) { - panic(); + if (to_us != 0U) { + uint64_t timeout_ref = timeout_init_us(to_us); + + while ((mmio_read_32(rcc_base + offset) & bitmsk) == 0U) { + if (timeout_elapsed(timeout_ref)) { + return -ETIMEDOUT; + } } } + + return 0; } -void stm32mp_reset_deassert(uint32_t id) +int stm32mp_reset_deassert(uint32_t id, unsigned int to_us) { uint32_t offset = id2reg_offset(id) + RCC_RSTCLRR_OFFSET; uint32_t bitmsk = BIT(id2reg_bit_pos(id)); - uint64_t timeout_ref; uintptr_t rcc_base = stm32mp_rcc_base(); mmio_write_32(rcc_base + offset, bitmsk); - timeout_ref = timeout_init_us(RESET_TIMEOUT_US_1MS); - while ((mmio_read_32(rcc_base + offset) & bitmsk) != 0U) { - if (timeout_elapsed(timeout_ref)) { - panic(); + if (to_us != 0U) { + uint64_t timeout_ref = timeout_init_us(to_us); + + while ((mmio_read_32(rcc_base + offset) & bitmsk) != 0U) { + if (timeout_elapsed(timeout_ref)) { + return -ETIMEDOUT; + } } } + + return 0; } |