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 2023/08/03 17:42:06 UTC
[nuttx] branch master updated (ea03d06ab3 -> af3600436e)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from ea03d06ab3 tmpfs: fix tmpfs_read overwrite after seek over tfo_size
new f3063ce12b armv7-a: align stack_top code with armv7-r
new 2cfea55f95 armv7-r: idle stack should align with 8
new af3600436e perf: avoid div zero if up_perf_init() hasn't init
The 3 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/arm/src/armv7-a/arm_head.S | 28 ++++++++++++++--------------
arch/arm/src/armv7-a/arm_perf.c | 2 +-
arch/arm/src/armv7-m/arm_perf.c | 2 +-
arch/arm/src/armv7-r/arm_head.S | 1 +
arch/arm/src/armv7-r/arm_perf.c | 2 +-
arch/arm/src/armv8-m/arm_perf.c | 2 +-
arch/xtensa/src/common/xtensa_perf.c | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)
[nuttx] 01/03: armv7-a: align stack_top code with armv7-r
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit f3063ce12b7763fd2868068b6b80ece6461f9ad5
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Apr 17 16:26:03 2023 +0800
armv7-a: align stack_top code with armv7-r
Signed-off-by: ligd <li...@xiaomi.com>
---
arch/arm/src/armv7-a/arm_head.S | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index d5df22ca07..9c9ce98de0 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -31,6 +31,18 @@
#include "chip.h"
#include "arm_internal.h"
+#ifndef IDLE_STACK_BASE
+ #ifdef CONFIG_BOOT_SDRAM_DATA
+ #define IDLE_STACK_BASE IDLE_STACK_VBASE
+ #elif defined(CONFIG_SMP)
+ #define IDLE_STACK_BASE _enoinit
+ #else
+ #define IDLE_STACK_BASE _ebss
+ #endif
+#endif
+
+#define IDLE_STACK_TOP (IDLE_STACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
+
#ifndef CONFIG_PAGING
.file "arm_head.S"
@@ -752,13 +764,7 @@ arm_data_initialize:
.size .Linitparms, . -.Linitparms
.Lstackpointer:
-#ifdef CONFIG_BOOT_SDRAM_DATA
- .long IDLE_STACK_VBASE+CONFIG_IDLETHREAD_STACKSIZE
-#elif defined(CONFIG_SMP)
- .long _enoinit+CONFIG_IDLETHREAD_STACKSIZE
-#else
- .long _ebss+CONFIG_IDLETHREAD_STACKSIZE
-#endif
+ .long IDLE_STACK_TOP
.size .Lstackpointer, . -.Lstackpointer
#ifdef CONFIG_BOOT_RUNFROMFLASH
@@ -786,13 +792,7 @@ arm_data_initialize:
g_idle_topstack:
-#ifdef CONFIG_BOOT_SDRAM_DATA
- .long IDLE_STACK_VBASE+CONFIG_IDLETHREAD_STACKSIZE
-#elif defined(CONFIG_SMP)
- .long _enoinit+CONFIG_IDLETHREAD_STACKSIZE
-#else
- .long _ebss+CONFIG_IDLETHREAD_STACKSIZE
-#endif
+ .long IDLE_STACK_TOP
.size g_idle_topstack, .-g_idle_topstack
.end
#endif
[nuttx] 03/03: perf: avoid div zero if up_perf_init() hasn't init
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit af3600436e415c0637adcac3798382a7c0438483
Author: ligd <li...@xiaomi.com>
AuthorDate: Fri Mar 24 23:35:30 2023 +0800
perf: avoid div zero if up_perf_init() hasn't init
Signed-off-by: ligd <li...@xiaomi.com>
---
arch/arm/src/armv7-a/arm_perf.c | 2 +-
arch/arm/src/armv7-m/arm_perf.c | 2 +-
arch/arm/src/armv7-r/arm_perf.c | 2 +-
arch/arm/src/armv8-m/arm_perf.c | 2 +-
arch/xtensa/src/common/xtensa_perf.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/armv7-a/arm_perf.c b/arch/arm/src/armv7-a/arm_perf.c
index d069f4ee5f..beed522aae 100644
--- a/arch/arm/src/armv7-a/arm_perf.c
+++ b/arch/arm/src/armv7-a/arm_perf.c
@@ -32,7 +32,7 @@
* Private Data
****************************************************************************/
-static unsigned long g_cpu_freq;
+static unsigned long g_cpu_freq = ULONG_MAX;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_perf.c b/arch/arm/src/armv7-m/arm_perf.c
index df890640f5..c977bdadf8 100644
--- a/arch/arm/src/armv7-m/arm_perf.c
+++ b/arch/arm/src/armv7-m/arm_perf.c
@@ -34,7 +34,7 @@
* Private Data
****************************************************************************/
-static unsigned long g_cpu_freq;
+static unsigned long g_cpu_freq = ULONG_MAX;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_perf.c b/arch/arm/src/armv7-r/arm_perf.c
index cf780c2d14..3c5c91b72d 100644
--- a/arch/arm/src/armv7-r/arm_perf.c
+++ b/arch/arm/src/armv7-r/arm_perf.c
@@ -32,7 +32,7 @@
* Private Data
****************************************************************************/
-static unsigned long g_cpu_freq;
+static unsigned long g_cpu_freq = ULONG_MAX;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_perf.c b/arch/arm/src/armv8-m/arm_perf.c
index 7d9d17d22d..de7f7d45c9 100644
--- a/arch/arm/src/armv8-m/arm_perf.c
+++ b/arch/arm/src/armv8-m/arm_perf.c
@@ -34,7 +34,7 @@
* Private Data
****************************************************************************/
-static unsigned long g_cpu_freq;
+static unsigned long g_cpu_freq = ULONG_MAX;
/****************************************************************************
* Public Functions
diff --git a/arch/xtensa/src/common/xtensa_perf.c b/arch/xtensa/src/common/xtensa_perf.c
index e8b240621e..f1f7d2a2ca 100644
--- a/arch/xtensa/src/common/xtensa_perf.c
+++ b/arch/xtensa/src/common/xtensa_perf.c
@@ -32,7 +32,7 @@
* Private Data
****************************************************************************/
-static unsigned long g_cpu_freq;
+static unsigned long g_cpu_freq = ULONG_MAX;
/****************************************************************************
* Public Functions
[nuttx] 02/03: armv7-r: idle stack should align with 8
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 2cfea55f95ae95e9824829680216a845d0015976
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Apr 17 16:25:31 2023 +0800
armv7-r: idle stack should align with 8
Signed-off-by: ligd <li...@xiaomi.com>
---
arch/arm/src/armv7-r/arm_head.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 428b0b2d3d..149fbcf921 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -161,6 +161,7 @@ __cpu0_start:
/* Set up the stack pointer and clear the frame pointer. */
ldr sp, .Lstackpointer
+ bic sp, sp, #7 /* Get the stack pointer with 8-byte alignment */
mov fp, #0
/* Invalidate caches and TLBs.