You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/05/01 16:12:07 UTC
[incubator-nuttx] branch releases/10.1 updated (112d709 -> 3130ff6)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch releases/10.1
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 112d709 arch/risc-v: Fix stack alignment according to calling convention
new 6802259 arch/risc-v: Fix interrupt stack alignment
new 3130ff6 risc-v/k210: Fix SMP interrupt stack size calculation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/risc-v/src/bl602/bl602_head.S | 2 +-
arch/risc-v/src/bl602/bl602_irq.c | 4 ++--
arch/risc-v/src/c906/c906_head.S | 4 ++--
arch/risc-v/src/c906/c906_irq.c | 4 ++--
arch/risc-v/src/common/riscv_checkstack.c | 6 +++---
arch/risc-v/src/common/riscv_initialize.c | 4 ++--
arch/risc-v/src/common/riscv_internal.h | 2 +-
arch/risc-v/src/fe310/fe310_head.S | 2 +-
arch/risc-v/src/fe310/fe310_irq.c | 4 ++--
arch/risc-v/src/k210/k210_head.S | 4 ++--
arch/risc-v/src/k210/k210_irq.c | 9 +++++++--
arch/risc-v/src/litex/litex_head.S | 2 +-
arch/risc-v/src/litex/litex_irq.c | 4 ++--
arch/risc-v/src/rv32im/riscv_assert.c | 6 +++---
arch/risc-v/src/rv64gc/riscv_assert.c | 6 +++---
15 files changed, 34 insertions(+), 29 deletions(-)
[incubator-nuttx] 02/02: risc-v/k210: Fix SMP interrupt stack size
calculation
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/10.1
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 3130ff691e386934eb276587a24d1efacf3bb30b
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Sat May 1 14:44:54 2021 +0200
risc-v/k210: Fix SMP interrupt stack size calculation
manual cherry-pick from #3636
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
arch/risc-v/src/k210/k210_irq.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/risc-v/src/k210/k210_irq.c b/arch/risc-v/src/k210/k210_irq.c
index 84767d8..1bf9f05 100644
--- a/arch/risc-v/src/k210/k210_irq.c
+++ b/arch/risc-v/src/k210/k210_irq.c
@@ -81,7 +81,12 @@ void up_irqinitialize(void)
/* Colorize the interrupt stack for debug purposes */
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
+ size_t intstack_size = 0;
+#ifndef CONFIG_SMP
+ intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
+#else
+ intstack_size = ((CONFIG_ARCH_INTERRUPTSTACK * CONFIG_SMP_NCPUS) & ~15);
+#endif
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
[incubator-nuttx] 01/02: arch/risc-v: Fix interrupt stack alignment
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/10.1
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 680225923d2160f9737c2817df3b9e4ee37d5844
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Sat May 1 14:42:45 2021 +0200
arch/risc-v: Fix interrupt stack alignment
manual cherry-pick from #3636
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
arch/risc-v/src/bl602/bl602_head.S | 2 +-
arch/risc-v/src/bl602/bl602_irq.c | 4 ++--
arch/risc-v/src/c906/c906_head.S | 4 ++--
arch/risc-v/src/c906/c906_irq.c | 4 ++--
arch/risc-v/src/common/riscv_checkstack.c | 6 +++---
arch/risc-v/src/common/riscv_initialize.c | 4 ++--
arch/risc-v/src/common/riscv_internal.h | 2 +-
arch/risc-v/src/fe310/fe310_head.S | 2 +-
arch/risc-v/src/fe310/fe310_irq.c | 4 ++--
arch/risc-v/src/k210/k210_head.S | 4 ++--
arch/risc-v/src/k210/k210_irq.c | 4 ++--
arch/risc-v/src/litex/litex_head.S | 2 +-
arch/risc-v/src/litex/litex_irq.c | 4 ++--
arch/risc-v/src/rv32im/riscv_assert.c | 6 +++---
arch/risc-v/src/rv64gc/riscv_assert.c | 6 +++---
15 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/risc-v/src/bl602/bl602_head.S b/arch/risc-v/src/bl602/bl602_head.S
index 4a76f7d..e8e942d 100644
--- a/arch/risc-v/src/bl602/bl602_head.S
+++ b/arch/risc-v/src/bl602/bl602_head.S
@@ -85,7 +85,7 @@ exception_common:
mv a1, sp /* context = sp */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
/* Switch to interrupt stack */
lui sp, %hi(g_intstackbase)
diff --git a/arch/risc-v/src/bl602/bl602_irq.c b/arch/risc-v/src/bl602/bl602_irq.c
index 73841cc..00ed54d 100644
--- a/arch/risc-v/src/bl602/bl602_irq.c
+++ b/arch/risc-v/src/bl602/bl602_irq.c
@@ -78,10 +78,10 @@ void up_irqinitialize(void)
up_irq_save();
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
/* Colorize the interrupt stack for debug purposes */
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+ size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
diff --git a/arch/risc-v/src/c906/c906_head.S b/arch/risc-v/src/c906/c906_head.S
index 2b495d9..feffd0d 100644
--- a/arch/risc-v/src/c906/c906_head.S
+++ b/arch/risc-v/src/c906/c906_head.S
@@ -191,7 +191,7 @@ exception_common:
mv a1, sp /* context = sp */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
/* Load mhartid (cpuid) */
csrr s0, mhartid
@@ -203,7 +203,7 @@ exception_common:
j 4f
3:
la sp, g_intstackbase
- addi sp, sp, -((CONFIG_ARCH_INTERRUPTSTACK) & ~7)
+ addi sp, sp, -((CONFIG_ARCH_INTERRUPTSTACK) & ~15)
4:
#endif
diff --git a/arch/risc-v/src/c906/c906_irq.c b/arch/risc-v/src/c906/c906_irq.c
index b8482b9..27c2494 100644
--- a/arch/risc-v/src/c906/c906_irq.c
+++ b/arch/risc-v/src/c906/c906_irq.c
@@ -72,8 +72,8 @@ void up_irqinitialize(void)
/* Colorize the interrupt stack for debug purposes */
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 7
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~7);
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
+ size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
diff --git a/arch/risc-v/src/common/riscv_checkstack.c b/arch/risc-v/src/common/riscv_checkstack.c
index eec04ae..14b600a 100644
--- a/arch/risc-v/src/common/riscv_checkstack.c
+++ b/arch/risc-v/src/common/riscv_checkstack.c
@@ -191,17 +191,17 @@ ssize_t up_check_stack_remain(void)
return up_check_tcbstack_remain(this_task());
}
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
size_t up_check_intstack(void)
{
return do_stackcheck((uintptr_t)&g_intstackalloc,
- (CONFIG_ARCH_INTERRUPTSTACK & ~3),
+ (CONFIG_ARCH_INTERRUPTSTACK & ~15),
true);
}
size_t up_check_intstack_remain(void)
{
- return (CONFIG_ARCH_INTERRUPTSTACK & ~3) - up_check_intstack();
+ return (CONFIG_ARCH_INTERRUPTSTACK & ~15) - up_check_intstack();
}
#endif
diff --git a/arch/risc-v/src/common/riscv_initialize.c b/arch/risc-v/src/common/riscv_initialize.c
index abbbe16..bcf07ba 100644
--- a/arch/risc-v/src/common/riscv_initialize.c
+++ b/arch/risc-v/src/common/riscv_initialize.c
@@ -53,13 +53,13 @@
*
****************************************************************************/
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
static inline void up_color_intstack(void)
{
uint32_t *ptr = (uint32_t *)&g_intstackalloc;
ssize_t size;
- for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+ for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
size > 0;
size -= sizeof(uint32_t))
{
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index 955065a..c071a20 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -133,7 +133,7 @@ EXTERN uint32_t g_idle_topstack;
/* Address of the saved user stack pointer */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
EXTERN uint32_t g_intstackalloc; /* Allocated stack base */
EXTERN uint32_t g_intstackbase; /* Initial top of interrupt stack */
#endif
diff --git a/arch/risc-v/src/fe310/fe310_head.S b/arch/risc-v/src/fe310/fe310_head.S
index 7b72575..85fad06 100644
--- a/arch/risc-v/src/fe310/fe310_head.S
+++ b/arch/risc-v/src/fe310/fe310_head.S
@@ -126,7 +126,7 @@ exception_common:
mv a1, sp /* context = sp */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
/* Switch to interrupt stack */
lui sp, %hi(g_intstackbase)
diff --git a/arch/risc-v/src/fe310/fe310_irq.c b/arch/risc-v/src/fe310/fe310_irq.c
index aa14a49..2529f44 100644
--- a/arch/risc-v/src/fe310/fe310_irq.c
+++ b/arch/risc-v/src/fe310/fe310_irq.c
@@ -59,8 +59,8 @@ void up_irqinitialize(void)
/* Colorize the interrupt stack for debug purposes */
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
+ size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
diff --git a/arch/risc-v/src/k210/k210_head.S b/arch/risc-v/src/k210/k210_head.S
index b7cced3..4ccaa02 100644
--- a/arch/risc-v/src/k210/k210_head.S
+++ b/arch/risc-v/src/k210/k210_head.S
@@ -143,7 +143,7 @@ normal_irq:
mv a1, sp /* context = sp */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
/* Load mhartid (cpuid) */
csrr s0, mhartid
@@ -155,7 +155,7 @@ normal_irq:
j 4f
3:
la sp, g_intstackbase
- addi sp, sp, -((CONFIG_ARCH_INTERRUPTSTACK) & ~7)
+ addi sp, sp, -((CONFIG_ARCH_INTERRUPTSTACK) & ~15)
4:
#endif
diff --git a/arch/risc-v/src/k210/k210_irq.c b/arch/risc-v/src/k210/k210_irq.c
index c00cc23..84767d8 100644
--- a/arch/risc-v/src/k210/k210_irq.c
+++ b/arch/risc-v/src/k210/k210_irq.c
@@ -80,8 +80,8 @@ void up_irqinitialize(void)
/* Colorize the interrupt stack for debug purposes */
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 7
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~7);
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
+ size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
diff --git a/arch/risc-v/src/litex/litex_head.S b/arch/risc-v/src/litex/litex_head.S
index 0e58cf3..c9e3f39 100644
--- a/arch/risc-v/src/litex/litex_head.S
+++ b/arch/risc-v/src/litex/litex_head.S
@@ -126,7 +126,7 @@ exception_common:
mv a1, sp /* context = sp */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
/* Switch to interrupt stack */
lui sp, %hi(g_intstackbase)
diff --git a/arch/risc-v/src/litex/litex_irq.c b/arch/risc-v/src/litex/litex_irq.c
index a0e8be9..cb90f54 100644
--- a/arch/risc-v/src/litex/litex_irq.c
+++ b/arch/risc-v/src/litex/litex_irq.c
@@ -58,8 +58,8 @@ void up_irqinitialize(void)
/* Colorize the interrupt stack for debug purposes */
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
- size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
+ size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size),
intstack_size);
#endif
diff --git a/arch/risc-v/src/rv32im/riscv_assert.c b/arch/risc-v/src/rv32im/riscv_assert.c
index a5eb5b3..7142ceb 100644
--- a/arch/risc-v/src/rv32im/riscv_assert.c
+++ b/arch/risc-v/src/rv32im/riscv_assert.c
@@ -173,7 +173,7 @@ static void riscv_dumpstate(void)
uint32_t sp = riscv_getsp();
uint32_t ustackbase;
uint32_t ustacksize;
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
uint32_t istackbase;
uint32_t istacksize;
#endif
@@ -189,9 +189,9 @@ static void riscv_dumpstate(void)
/* Get the limits on the interrupt stack memory */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
istackbase = (uint32_t)&g_intstackbase;
- istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4;
+ istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~15) - 4;
/* Show interrupt stack info */
diff --git a/arch/risc-v/src/rv64gc/riscv_assert.c b/arch/risc-v/src/rv64gc/riscv_assert.c
index 0d10c356..dfe6ef9 100644
--- a/arch/risc-v/src/rv64gc/riscv_assert.c
+++ b/arch/risc-v/src/rv64gc/riscv_assert.c
@@ -184,7 +184,7 @@ static void up_dumpstate(void)
uint64_t sp = riscv_getsp();
uintptr_t ustackbase;
uintptr_t ustacksize;
-#if CONFIG_ARCH_INTERRUPTSTACK > 7
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
uintptr_t istackbase;
uintptr_t istacksize;
#endif
@@ -200,9 +200,9 @@ static void up_dumpstate(void)
/* Get the limits on the interrupt stack memory */
-#if CONFIG_ARCH_INTERRUPTSTACK > 7
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
istackbase = (uintptr_t)&g_intstackbase;
- istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~7) - 8;
+ istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~15) - 8;
/* Show interrupt stack info */