Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 22:35:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

delay: timeout detection support

Browse source 
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 <etienne.carriere@linaro.org>
Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Change-Id: Iaef6d43c11a2e6992fb48efdc674a0552755ad9c
This commit is contained in:
Lionel Debieve 2019-09-24 16:59:56 +02:00
parent cf9319f46a
commit 0711ee5cbc
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/drivers/delay_timer.h
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,8 +8,11 @@
#ifndef DELAY_TIMER_H #ifndef DELAY_TIMER_H
#define DELAY_TIMER_H #define DELAY_TIMER_H
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <arch_helpers.h>
/******************************************************************** /********************************************************************
* A simple timer driver providing synchronous delay functionality. * A simple timer driver providing synchronous delay functionality.
* The driver must be initialized with a structure that provides a * The driver must be initialized with a structure that provides a
@ -23,6 +27,25 @@ typedef struct timer_ops {
uint32_t clk_div; uint32_t clk_div;
} timer_ops_t; } 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 mdelay(uint32_t msec);
void udelay(uint32_t usec); void udelay(uint32_t usec);
void timer_init(const timer_ops_t *ops_ptr); void timer_init(const timer_ops_t *ops_ptr);

1
plat/marvell/a8k/common/ble/ble.mk
View file

@ -19,6 +19,7 @@ BLE_SOURCES += $(BLE_PATH)/ble_main.c \
PLAT_INCLUDES += -I$(MV_DDR_PATH) \ PLAT_INCLUDES += -I$(MV_DDR_PATH) \
-I$(CURDIR)/include \ -I$(CURDIR)/include \
-I$(CURDIR)/include/arch/aarch64 \
-I$(CURDIR)/include/lib/libc \ -I$(CURDIR)/include/lib/libc \
-I$(CURDIR)/include/lib/libc/aarch64 \ -I$(CURDIR)/include/lib/libc/aarch64 \
-I$(CURDIR)/drivers/marvell -I$(CURDIR)/drivers/marvell

18
plat/st/common/include/stm32mp_common.h
View file

@ -1,6 +1,5 @@
/* /*
* Copyright (C) 2018-2019, STMicroelectronics - All Rights Reserved * Copyright (C) 2018-2019, STMicroelectronics - All Rights Reserved
* Copyright (c) 2018-2019, Linaro Limited
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -12,8 +11,6 @@
#include <platform_def.h> #include <platform_def.h>
#include <arch_helpers.h>
/* Functions to save and get boot context address given by ROM code */ /* Functions to save and get boot context address given by ROM code */
void stm32mp_save_boot_ctx_address(uintptr_t address); void stm32mp_save_boot_ctx_address(uintptr_t address);
uintptr_t stm32mp_get_boot_ctx_address(void); 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 */ /* Initialise the IO layer and register platform IO devices */
void stm32mp_io_setup(void); 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 * Check that the STM32 header of a .stm32 binary image is valid
* @param header: pointer to the stm32 image header * @param header: pointer to the stm32 image header