From 0711ee5cbc5645b55de1a751bd52dc8ce02ae037 Mon Sep 17 00:00:00 2001 From: Lionel Debieve Date: Tue, 24 Sep 2019 16:59:56 +0200 Subject: [PATCH] delay: timeout detection support Introduce timeout_init_us/timeout_elapsed() delay tracking with CNTPCT. timeout_init_us(some_timeout_us); returns a reference to detect timeout for the provided microsecond delay value from current time. timeout_elapsed(reference) return true/false whether the reference timeout is elapsed. Cherry picked from OP-TEE implementation [1]. [1] commit 33d30a74502b ("core: timeout detection support") Minor: - Remove stm32mp platform duplicated implementation. - Add new include in marvell ble.mk Signed-off-by: Etienne Carriere Signed-off-by: Lionel Debieve Change-Id: Iaef6d43c11a2e6992fb48efdc674a0552755ad9c --- include/drivers/delay_timer.h | 25 ++++++++++++++++++++++++- plat/marvell/a8k/common/ble/ble.mk | 1 + plat/st/common/include/stm32mp_common.h | 18 ------------------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h index 684f1c3c..e5044cc6 100644 --- a/include/drivers/delay_timer.h +++ b/include/drivers/delay_timer.h @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2019, Linaro Limited * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,8 +8,11 @@ #ifndef DELAY_TIMER_H #define DELAY_TIMER_H +#include #include +#include + /******************************************************************** * A simple timer driver providing synchronous delay functionality. * The driver must be initialized with a structure that provides a @@ -23,6 +27,25 @@ typedef struct timer_ops { uint32_t clk_div; } timer_ops_t; +static inline uint64_t timeout_cnt_us2cnt(uint32_t us) +{ + return ((uint64_t)us * (uint64_t)read_cntfrq_el0()) / 1000000ULL; +} + +static inline uint64_t timeout_init_us(uint32_t us) +{ + uint64_t cnt = timeout_cnt_us2cnt(us); + + cnt += read_cntfrq_el0(); + + return cnt; +} + +static inline bool timeout_elapsed(uint64_t expire_cnt) +{ + return read_cntpct_el0() > expire_cnt; +} + void mdelay(uint32_t msec); void udelay(uint32_t usec); void timer_init(const timer_ops_t *ops_ptr); diff --git a/plat/marvell/a8k/common/ble/ble.mk b/plat/marvell/a8k/common/ble/ble.mk index b24083fc..b6a9cd29 100644 --- a/plat/marvell/a8k/common/ble/ble.mk +++ b/plat/marvell/a8k/common/ble/ble.mk @@ -19,6 +19,7 @@ BLE_SOURCES += $(BLE_PATH)/ble_main.c \ PLAT_INCLUDES += -I$(MV_DDR_PATH) \ -I$(CURDIR)/include \ + -I$(CURDIR)/include/arch/aarch64 \ -I$(CURDIR)/include/lib/libc \ -I$(CURDIR)/include/lib/libc/aarch64 \ -I$(CURDIR)/drivers/marvell diff --git a/plat/st/common/include/stm32mp_common.h b/plat/st/common/include/stm32mp_common.h index 59657fdc..4f856797 100644 --- a/plat/st/common/include/stm32mp_common.h +++ b/plat/st/common/include/stm32mp_common.h @@ -1,6 +1,5 @@ /* * Copyright (C) 2018-2019, STMicroelectronics - All Rights Reserved - * Copyright (c) 2018-2019, Linaro Limited * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,8 +11,6 @@ #include -#include - /* Functions to save and get boot context address given by ROM code */ void stm32mp_save_boot_ctx_address(uintptr_t address); uintptr_t stm32mp_get_boot_ctx_address(void); @@ -82,21 +79,6 @@ unsigned long stm32mp_clk_get_rate(unsigned long id); /* Initialise the IO layer and register platform IO devices */ void stm32mp_io_setup(void); -static inline uint64_t arm_cnt_us2cnt(uint32_t us) -{ - return ((uint64_t)us * (uint64_t)read_cntfrq()) / 1000000ULL; -} - -static inline uint64_t timeout_init_us(uint32_t us) -{ - return read_cntpct_el0() + arm_cnt_us2cnt(us); -} - -static inline bool timeout_elapsed(uint64_t expire) -{ - return read_cntpct_el0() > expire; -} - /* * Check that the STM32 header of a .stm32 binary image is valid * @param header: pointer to the stm32 image header -- 2.30.2