Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/xtensa: Simply use xtensa_createstack for CPU1 idle task.

Browse Source 
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2022-04-25 14:54:18 +02:00
committed by Xiang Xiao
parent 6546789b7e
commit aaa5316235
4 changed files with 6 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/esp32/esp32_cpuidlestack.c
+3 -35
View File
@@ -34,11 +34,6 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* Address of the CPU0 IDLE thread */
uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS]
aligned_data(16) locate_data(".noinit");
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@@ -81,41 +76,14 @@ uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS]
* being created for. * being created for.
* - tcb: The TCB of new CPU IDLE task * - tcb: The TCB of new CPU IDLE task
* - stack_size: The requested stack size for the IDLE task. At least * - stack_size: The requested stack size for the IDLE task. At least
* this much must be allocated. This should be * this much must be allocated.
* CONFIG_IDLETHREAD_STACKSIZE.
* *
****************************************************************************/ ****************************************************************************/
int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size) int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size)
{ {
/* XTENSA uses a push-down stack: the stack grows toward lower* addresses #if CONFIG_SMP_NCPUS > 1
* in memory. The stack pointer register points to the lowest, valid up_create_stack(tcb, stack_size, TCB_FLAG_TTYPE_KERNEL);
* working address (the "top" of the stack). Items on the stack are
* referenced as positive word offsets from sp.
*/
/* Save information about pre-allocated IDLE thread stack */
tcb->stack_alloc_ptr = g_cpu1_idlestack;
tcb->adj_stack_size = CPU1_IDLETHREAD_STACKSIZE;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
#ifdef CONFIG_STACK_COLORATION
{
register uint32_t *ptr;
register int i;
/* If stack debug is enabled, then fill the stack with a recognizable
* value that we can use later to test for high water marks.
*/
for (i = 0, ptr = (uint32_t *)tcb->stack_alloc_ptr;
i < tcb->adj_stack_size;
i += sizeof(uint32_t))
{
*ptr++ = STACK_COLOR;
}
}
#endif #endif
#if XCHAL_CP_NUM > 0 #if XCHAL_CP_NUM > 0
arch/xtensa/src/esp32/esp32_smp.h
-15
View File
@@ -33,25 +33,10 @@
* Pre-procesor Definitions * Pre-procesor Definitions
****************************************************************************/ ****************************************************************************/
/* An IDLE thread stack size for CPU0 must be defined */
#if !defined(CONFIG_IDLETHREAD_STACKSIZE)
# error CONFIG_IDLETHREAD_STACKSIZE is not defined
#elif CONFIG_IDLETHREAD_STACKSIZE < 16
# error CONFIG_IDLETHREAD_STACKSIZE is to small
#endif
#define CPU1_IDLETHREAD_STACKSIZE ((CONFIG_IDLETHREAD_STACKSIZE + 15) & ~15)
#define CPU1_IDLETHREAD_STACKWORDS (CPU1_IDLETHREAD_STACKSIZE >> 2)
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* This is the CPU1 IDLE stack */
extern uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS];
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
arch/xtensa/src/esp32s3/esp32s3_cpuidlestack.c
+3 -35
View File
@@ -34,11 +34,6 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* Address of the CPU1 IDLE thread */
uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS]
aligned_data(16) locate_data(".noinit");
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@@ -81,41 +76,14 @@ uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS]
* being created for. * being created for.
* - tcb: The TCB of new CPU IDLE task * - tcb: The TCB of new CPU IDLE task
* - stack_size: The requested stack size for the IDLE task. At least * - stack_size: The requested stack size for the IDLE task. At least
* this much must be allocated. This should be * this much must be allocated.
* CONFIG_IDLETHREAD_STACKSIZE.
* *
****************************************************************************/ ****************************************************************************/
int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size) int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size)
{ {
/* XTENSA uses a push-down stack: the stack grows toward lower* addresses #if CONFIG_SMP_NCPUS > 1
* in memory. The stack pointer register points to the lowest, valid up_create_stack(tcb, stack_size, TCB_FLAG_TTYPE_KERNEL);
* working address (the "top" of the stack). Items on the stack are
* referenced as positive word offsets from sp.
*/
/* Save information about pre-allocated IDLE thread stack */
tcb->stack_alloc_ptr = g_cpu1_idlestack;
tcb->adj_stack_size = CPU1_IDLETHREAD_STACKSIZE;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
#ifdef CONFIG_STACK_COLORATION
{
register uint32_t *ptr;
register int i;
/* If stack debug is enabled, then fill the stack with a recognizable
* value that we can use later to test for high water marks.
*/
for (i = 0, ptr = (uint32_t *)tcb->stack_alloc_ptr;
i < tcb->adj_stack_size;
i += sizeof(uint32_t))
{
*ptr++ = STACK_COLOR;
}
}
#endif #endif
return OK; return OK;
arch/xtensa/src/esp32s3/esp32s3_smp.h
-15
View File
@@ -33,25 +33,10 @@
* Pre-procesor Definitions * Pre-procesor Definitions
****************************************************************************/ ****************************************************************************/
/* An IDLE thread stack size for CPU0 must be defined */
#if !defined(CONFIG_IDLETHREAD_STACKSIZE)
# error CONFIG_IDLETHREAD_STACKSIZE is not defined
#elif CONFIG_IDLETHREAD_STACKSIZE < 16
# error CONFIG_IDLETHREAD_STACKSIZE is to small
#endif
#define CPU1_IDLETHREAD_STACKSIZE ((CONFIG_IDLETHREAD_STACKSIZE + 15) & ~15)
#define CPU1_IDLETHREAD_STACKWORDS (CPU1_IDLETHREAD_STACKSIZE >> 2)
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* This is the CPU1 IDLE stack */
extern uint32_t g_cpu1_idlestack[CPU1_IDLETHREAD_STACKWORDS];
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/