sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configs/stm32f4discovery: Add timing support for the critical section monitor using the DWT CYCNT register.

Browse Source
This commit is contained in:
Gregory Nutt 2018-11-24 11:06:34 -06:00
parent fc6084f311
commit a1cb270478
5 changed files with 96 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/stm32f4discovery/src/Makefile
View File

@ -45,6 +45,10 @@ else
CSRCS += stm32_userleds.c
endif
ifeq ($(CONFIG_SCHED_CRITMONITOR),y)
CSRCS += stm32_critmon.c
endif
ifeq ($(CONFIG_AUDIO_CS43L22),y)
CSRCS += stm32_cs43l22.c
endif

87
configs/stm32f4discovery/src/stm32_critmon.c Normal file
View File

@ -0,0 +1,87 @@
/************************************************************************************
* config/stm32f4discovery/src/stm32_netinit.c
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <time.h>
#include <fixedmath.h>
#include "up_arch.h"
#include <nuttx/clock.h>
#include <arch/board/board.h>
#ifdef CONFIG_SCHED_CRITMONITOR
/************************************************************************************
* Public Functions
************************************************************************************/
/* Cycle count register in the Data Watchpoint and Trace (DWT) Unit */
#define DWT_CYCCNT 0xe0001004
/************************************************************************************
* Public Functions
************************************************************************************/
/************************************************************************************
* Name: up_critmon_gettime
************************************************************************************/
uint32_t up_critmon_gettime(void)
{
return getreg32(DWT_CYCCNT);
}
/************************************************************************************
* Name: up_critmon_gettime
************************************************************************************/
void up_critmon_convert(uint32_t elapsed, FAR struct timespec *ts)
{
b32_t b32elapsed;
b32elapsed = itob32(elapsed) / STM32_SYSCLK_FREQUENCY;
ts->tv_sec = b32toi(b32elapsed);
ts->tv_nsec = NSEC_PER_SEC * b32frac(b32elapsed) / b32ONE;
}
#endif /* CONFIG_SCHED_CRITMONITOR */

2
sched/Kconfig
View File

@ -717,7 +717,7 @@ config SCHED_CRITMONITOR
provided by platform-specific logic:
uint32_t up_critmon_gettime(void);
void up_critmon_convert(uint32_t starttime, FAR struct timespec *ts);
void up_critmon_convert(uint32_t elapsed, FAR struct timespec *ts);
The first interface simply provides the current time value in unknown
units. NOTE: This function may be called early before the timer has

4
sched/sched/sched_lock.c
View File

@ -259,7 +259,7 @@ int sched_lock(void)
/* Note that we have pre-emption locked */
#ifdef CONFIG_SCHED_CRITMONITOR
sched_critmon_premption(rtcb, true);
sched_critmon_preemption(rtcb, true);
#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
sched_note_premption(rtcb, true);
@ -314,7 +314,7 @@ int sched_lock(void)
/* Note that we have pre-emption locked */
#ifdef CONFIG_SCHED_CRITMONITOR
sched_critmon_premption(rtcb, true);
sched_critmon_preemption(rtcb, true);
#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
sched_note_premption(rtcb, true);

4
sched/sched/sched_unlock.c
View File

@ -106,7 +106,7 @@ int sched_unlock(void)
/* Note that we no longer have pre-emption disabled. */
#ifdef CONFIG_SCHED_CRITMONITOR
sched_critmon_premption(rtcb, false);
sched_critmon_preemption(rtcb, false);
#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
sched_note_premption(rtcb, false);
@ -261,7 +261,7 @@ int sched_unlock(void)
/* Note that we no longer have pre-emption disabled. */
#ifdef CONFIG_SCHED_CRITMONITOR
sched_critmon_premption(rtcb, false);
sched_critmon_preemption(rtcb, false);
#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
sched_note_premption(rtcb, false);