luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

armv7-m/armv8-m: move up_pref* api to common place

Browse source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
ligd 2022-03-26 03:01:10 +08:00 • committed by Petro Karashchenko
parent 052c071867
commit f623ac0f13
8 changed files with 79 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
boards/arm/stm32/omnibusf4/src/stm32_perfcount.c → arch/arm/src/armv7-m/arm_perf.c
View file

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/arm/stm32/omnibusf4/src/stm32_perfcount.c * arch/arm/src/armv7-m/arm_perf.c
* *
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -22,49 +22,55 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/arch.h>
#include <time.h>
#include <fixedmath.h>
#include "dwt.h"
#include "arm_internal.h"
#include <nuttx/clock.h> #include <nuttx/clock.h>
#include <arch/board/board.h> #include "arm_arch.h"
#include "dwt.h"
#include "itm.h"
#include "nvic.h"
/****************************************************************************
* Private Data
****************************************************************************/
static uint32_t g_cpu_freq;
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** void up_perf_init(FAR void *arg)
* Name: up_perf_gettime {
****************************************************************************/ g_cpu_freq = (uint32_t)(uintptr_t)arg;
/* Enable ITM and DWT resources, if not left enabled by debugger. */
modifyreg32(NVIC_DEMCR, 0, NVIC_DEMCR_TRCENA);
/* Make sure the high speed cycle counter is running. It will be started
* automatically only if a debugger is connected.
*/
putreg32(0xc5acce55, ITM_LAR);
modifyreg32(DWT_CTRL, 0, DWT_CTRL_CYCCNTENA_MASK);
}
uint32_t up_perf_getfreq(void)
{
return g_cpu_freq;
}
uint32_t up_perf_gettime(void) uint32_t up_perf_gettime(void)
{ {
return getreg32(DWT_CYCCNT); return getreg32(DWT_CYCCNT);
} }
/****************************************************************************
* Name: up_perf_getfreq
****************************************************************************/
uint32_t up_perf_getfreq(void)
{
return STM32_SYSCLK_FREQUENCY;
}
/****************************************************************************
* Name: up_perf_convert
****************************************************************************/
void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts) void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts)
{ {
b32_t b32elapsed; uint32_t left;
b32elapsed = itob32(elapsed) / STM32_SYSCLK_FREQUENCY; ts->tv_sec = elapsed / g_cpu_freq;
ts->tv_sec = b32toi(b32elapsed); left = elapsed - ts->tv_sec * g_cpu_freq;
ts->tv_nsec = NSEC_PER_SEC * b32frac(b32elapsed) / b32ONE; ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq;
} }

66
boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c → arch/arm/src/armv8-m/arm_perf.c
View file

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c * arch/arm/src/armv8-m/arm_perf.c
* *
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -22,49 +22,55 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/arch.h>
#include <time.h>
#include <fixedmath.h>
#include "dwt.h"
#include "arm_internal.h"
#include <nuttx/clock.h> #include <nuttx/clock.h>
#include <arch/board/board.h> #include "arm_arch.h"
#include "dwt.h"
#include "itm.h"
#include "nvic.h"
/****************************************************************************
* Private Data
****************************************************************************/
static uint32_t g_cpu_freq;
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** void up_perf_init(FAR void *arg)
* Name: up_perf_gettime {
****************************************************************************/ g_cpu_freq = (uint32_t)(uintptr_t)arg;
/* Enable ITM and DWT resources, if not left enabled by debugger. */
modifyreg32(NVIC_DEMCR, 0, NVIC_DEMCR_TRCENA);
/* Make sure the high speed cycle counter is running. It will be started
* automatically only if a debugger is connected.
*/
putreg32(0xc5acce55, ITM_LAR);
modifyreg32(DWT_CTRL, 0, DWT_CTRL_CYCCNTENA_MASK);
}
uint32_t up_perf_getfreq(void)
{
return g_cpu_freq;
}
uint32_t up_perf_gettime(void) uint32_t up_perf_gettime(void)
{ {
return getreg32(DWT_CYCCNT); return getreg32(DWT_CYCCNT);
} }
/****************************************************************************
* Name: up_perf_getfreq
****************************************************************************/
uint32_t up_perf_getfreq(void)
{
return STM32_SYSCLK_FREQUENCY;
}
/****************************************************************************
* Name: up_perf_convert
****************************************************************************/
void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts) void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts)
{ {
b32_t b32elapsed; uint32_t left;
b32elapsed = itob32(elapsed) / STM32_SYSCLK_FREQUENCY; ts->tv_sec = elapsed / g_cpu_freq;
ts->tv_sec = b32toi(b32elapsed); left = elapsed - ts->tv_sec * g_cpu_freq;
ts->tv_nsec = NSEC_PER_SEC * b32frac(b32elapsed) / b32ONE; ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq;
} }

11
boards/arm/stm32/axoloti/src/stm32_boot.c
View file

@ -54,16 +54,7 @@
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
/* Enable ITM and DWT resources, if not left enabled by debugger. */ up_perf_init((FAR void *)STM32_SYSCLK_FREQUENCY);
modifyreg32(NVIC_DEMCR, 0, NVIC_DEMCR_TRCENA);
/* Make sure the high speed cycle counter is running. It will be started
* automatically only if a debugger is connected.
*/
putreg32(0xc5acce55, ITM_LAR);
modifyreg32(DWT_CTRL, 0, DWT_CTRL_CYCCNTENA_MASK);
#endif #endif
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || \ #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || \

2
boards/arm/stm32/omnibusf4/src/Make.defs
View file

@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_userleds.c stm32_perfcount.c CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_userleds.c
ifeq ($(CONFIG_SENSORS_MPU60X0),y) ifeq ($(CONFIG_SENSORS_MPU60X0),y)
CSRCS += stm32_mpu6000.c CSRCS += stm32_mpu6000.c

11
boards/arm/stm32/omnibusf4/src/stm32_boot.c
View file

@ -54,16 +54,7 @@
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
/* Enable ITM and DWT resources, if not left enabled by debugger. */ up_perf_init((FAR void *)STM32_SYSCLK_FREQUENCY);
modifyreg32(NVIC_DEMCR, 0, NVIC_DEMCR_TRCENA);
/* Make sure the high speed cycle counter is running. It will be started
* automatically only if a debugger is connected.
*/
putreg32(0xc5acce55, ITM_LAR);
modifyreg32(DWT_CTRL, 0, DWT_CTRL_CYCCNTENA_MASK);
#endif #endif
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

2
boards/arm/stm32/stm32f4discovery/src/Make.defs
View file

@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_perfcount.c CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += stm32_autoleds.c CSRCS += stm32_autoleds.c

11
boards/arm/stm32/stm32f4discovery/src/stm32_boot.c
View file

@ -54,16 +54,7 @@
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
/* Enable ITM and DWT resources, if not left enabled by debugger. */ up_perf_init((FAR void *)STM32_SYSCLK_FREQUENCY);
modifyreg32(NVIC_DEMCR, 0, NVIC_DEMCR_TRCENA);
/* Make sure the high speed cycle counter is running. It will be started
* automatically only if a debugger is connected.
*/
putreg32(0xc5acce55, ITM_LAR);
modifyreg32(DWT_CTRL, 0, DWT_CTRL_CYCCNTENA_MASK);
#endif #endif
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

2
include/nuttx/arch.h
View file

@ -2555,8 +2555,10 @@ void arch_sporadic_resume(FAR struct tcb_s *tcb);
* *
* The second interface simple converts an elapsed time into well known * The second interface simple converts an elapsed time into well known
* units. * units.
*
****************************************************************************/ ****************************************************************************/
void up_perf_init(FAR void *arg);
uint32_t up_perf_gettime(void); uint32_t up_perf_gettime(void);
uint32_t up_perf_getfreq(void); uint32_t up_perf_getfreq(void);
void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts); void up_perf_convert(uint32_t elapsed, FAR struct timespec *ts);