This is an automated email from the ASF dual-hosted git repository.

GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 699d07fcf8f59c7994987ec2cdc6d3464607b554
Author: sunjikun <[email protected]>
AuthorDate: Thu Sep 26 10:58:21 2024 +0800

    ARM64: add ARCH_SKIP_ZERO_BSS option
    
    Add ARCH_SKIP_ZERO_BSS option to enable it. This can save a lot of boot 
time.
    
    Signed-off-by: sunjikun <[email protected]>
    Signed-off-by: hujun5 <[email protected]>
---
 arch/Kconfig                            | 7 +++++++
 arch/arm/src/arm/arm_head.S             | 2 ++
 arch/arm/src/armv7-a/arm_head.S         | 4 ++++
 arch/arm/src/armv7-a/arm_pghead.S       | 4 ++++
 arch/arm/src/armv7-r/arm_head.S         | 4 ++++
 arch/arm/src/armv8-r/arm_head.S         | 4 ++++
 arch/arm/src/mps/mps_start.c            | 2 ++
 arch/arm64/src/common/arm64_head.S      | 6 ++++++
 arch/risc-v/src/qemu-rv/qemu_rv_start.c | 2 ++
 arch/x86_64/src/intel64/intel64_start.c | 2 ++
 arch/xtensa/src/esp32/esp32_start.c     | 5 ++++-
 arch/xtensa/src/esp32s2/esp32s2_start.c | 6 ++++--
 arch/xtensa/src/esp32s3/esp32s3_start.c | 2 ++
 13 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 869444f3979..616436bab92 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1342,6 +1342,13 @@ config ARCH_RAMFUNCS
                so that FLASH can be reconfigured while the MCU executes out of
                SRAM.
 
+config ARCH_SKIP_ZERO_BSS
+       bool "Skip zero bss section"
+       default n
+       ---help---
+               BSS must be set to all zero if there is no external preparation.
+               But it will take a lot of boot time.
+
 config ARCH_HAVE_CUSTOM_VECTORS
        bool
        default n
diff --git a/arch/arm/src/arm/arm_head.S b/arch/arm/src/arm/arm_head.S
index ece9eff9284..782f3f5bbdd 100644
--- a/arch/arm/src/arm/arm_head.S
+++ b/arch/arm/src/arm/arm_head.S
@@ -571,10 +571,12 @@ __start:
 
        mov             fp, #0
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
 .Lbssinit:
        cmp             r0, r1                          /* Clear up to 
_bss_end_ */
        strcc           fp, [r0],#4
        bcc             .Lbssinit
+#endif
 
        /* If the .data section is in a separate, uninitialized address space,
         * then we will also need to copy the initial values of the .data
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index b380f924376..d9df2832115 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -729,6 +729,7 @@ arm_data_initialize:
 
        /* Zero BSS */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        adr             r0, .Linitparms
        ldmia           r0, {r0, r1}
 
@@ -737,6 +738,7 @@ arm_data_initialize:
        cmp             r0, r1                          /* Clear up to 
_bss_end_ */
        strcc           r2, [r0], #4
        bcc             1b
+#endif
 
 #ifdef CONFIG_BOOT_RUNFROMFLASH
        /* If the .data section is in a separate, uninitialized address space,
@@ -792,11 +794,13 @@ arm_data_initialize:
 
 #endif /* CONFIG_ARCH_ROMPGTABLE */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        .type   .Linitparms, %object
 .Linitparms:
        .long   _sbss
        .long   _ebss
        .size   .Linitparms, . -.Linitparms
+#endif
 
 .Lstackpointer:
        .long   IDLE_STACK_TOP
diff --git a/arch/arm/src/armv7-a/arm_pghead.S 
b/arch/arm/src/armv7-a/arm_pghead.S
index bf17f2ec90f..e318a13c87d 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -701,6 +701,7 @@ arm_data_initialize:
 
        /* Zero BSS */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        adr             r0, .Linitparms
        ldmia           r0, {r0, r1}
 
@@ -709,6 +710,7 @@ arm_data_initialize:
        cmp             r0, r1                          /* Clear up to 
_bss_end_ */
        strcc           r2, [r0], #4
        bcc             1b
+#endif
 
 #ifdef CONFIG_BOOT_RUNFROMFLASH
        /* If the .data section is in a separate, uninitialized address space,
@@ -754,11 +756,13 @@ arm_data_initialize:
         * to the end of SDRAM.
         */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        .type   .Linitparms, %object
 .Linitparms:
        .long   _sbss
        .long   _ebss
        .size   .Linitparms, . -.Linitparms
+#endif
 
 .Lstackpointer:
 #ifdef CONFIG_BOOT_SDRAM_DATA
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 8d63ad25140..beb304c75fa 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -436,6 +436,7 @@ arm_data_initialize:
 
        /* Zero BSS */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        adr             r0, .Linitparms
        ldmia           r0, {r0, r1}
 
@@ -444,6 +445,7 @@ arm_data_initialize:
        cmp             r0, r1                          /* Clear up to 
_bss_end_ */
        strcc           r2, [r0], #4
        bcc             1b
+#endif
 
 #ifdef CONFIG_BOOT_RUNFROMFLASH
        /* If the .data section is in a separate, uninitialized address space,
@@ -519,10 +521,12 @@ arm_data_initialize:
         * end of memory.  See g_idle_topstack below.
         */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        .type   .Linitparms, %object
 .Linitparms:
        .long   _sbss
        .long   _ebss
+#endif
 
 #ifdef CONFIG_BOOT_RUNFROMFLASH
        .type   .Ldatainit, %object
diff --git a/arch/arm/src/armv8-r/arm_head.S b/arch/arm/src/armv8-r/arm_head.S
index 9d842db05fd..2147936b098 100644
--- a/arch/arm/src/armv8-r/arm_head.S
+++ b/arch/arm/src/armv8-r/arm_head.S
@@ -297,6 +297,7 @@ arm_data_initialize:
 
        /* Zero BSS */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
        adr             r0, .Linitparms
        ldmia           r0, {r0, r1}
 
@@ -305,6 +306,7 @@ arm_data_initialize:
        cmp             r0, r1                          /* Clear up to 
_bss_end_ */
        strcc           r2, [r0], #4
        bcc             1b
+#endif
 
 #ifdef CONFIG_BOOT_RUNFROMFLASH
        /* If the .data section is in a separate, uninitialized address space,
@@ -577,6 +579,7 @@ sctlr_initialize:
         * end of memory.  See g_idle_topstack below.
         */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
 #ifdef __ghs__
        .type   .Linitparms, $object
 #else
@@ -585,6 +588,7 @@ sctlr_initialize:
 .Linitparms:
        .long   _sbss
        .long   _ebss
+#endif
 
 .Lhypvectorstart:
        .long   _hyp_vector_start
diff --git a/arch/arm/src/mps/mps_start.c b/arch/arm/src/mps/mps_start.c
index 7df3063fc27..086753a6f7d 100644
--- a/arch/arm/src/mps/mps_start.c
+++ b/arch/arm/src/mps/mps_start.c
@@ -134,10 +134,12 @@ void __start(void)
 
   /* Set bss to zero */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   for (dest = (uint32_t *)_sbss; dest < (uint32_t *)_ebss; )
     {
       *dest++ = 0;
     }
+#endif
 
   /* Copy the program from FLASH to RAM. */
 
diff --git a/arch/arm64/src/common/arm64_head.S 
b/arch/arm64/src/common/arm64_head.S
index d219cf6c4dc..e61f6d0fc4f 100644
--- a/arch/arm64/src/common/arm64_head.S
+++ b/arch/arm64/src/common/arm64_head.S
@@ -226,7 +226,9 @@ primary_core:
     bl    arm64_earlyprintinit
 #endif
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
     bl    arm64_data_initialize
+#endif
 
     PRINT(primary_boot, "- Ready to Boot Primary CPU\r\n")
 
@@ -381,6 +383,8 @@ boot_stage_puts:
 
 #endif /* !CONFIG_ARCH_EARLY_PRINT */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
+
 /***************************************************************************
  * Name: arm64_data_initialize
  ***************************************************************************/
@@ -416,3 +420,5 @@ arm64_data_initialize:
     .quad   _sbss
     .quad   _ebss
     .size   .Linitparms, . -.Linitparms
+
+#endif /* CONFIG_ARCH_SKIP_ZERO_BSS */
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_start.c 
b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
index c8bc4710c44..5cf1b8d9a4f 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_start.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
@@ -86,10 +86,12 @@ static void qemu_rv_clear_bss(void)
    * certain that there are no issues with the state of global variables.
    */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   for (dest = (uint32_t *)_sbss; dest < (uint32_t *)_ebss; )
     {
       *dest++ = 0;
     }
+#endif
 }
 
 #ifdef CONFIG_BUILD_PROTECTED
diff --git a/arch/x86_64/src/intel64/intel64_start.c 
b/arch/x86_64/src/intel64/intel64_start.c
index 71945b37940..26f1f48cc21 100644
--- a/arch/x86_64/src/intel64/intel64_start.c
+++ b/arch/x86_64/src/intel64/intel64_start.c
@@ -157,10 +157,12 @@ void __nxstart(void)
    * so this *must be* called after enabling SSE instructions.
    */
 
+#ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   for (dest = (uint64_t *)_sbss; dest < (uint64_t *)_ebss; )
     {
       *dest++ = 0;
     }
+#endif
 
 #ifdef CONFIG_SCHED_THREAD_LOCAL
   /* Make sure that FS_BASE is not null */
diff --git a/arch/xtensa/src/esp32/esp32_start.c 
b/arch/xtensa/src/esp32/esp32_start.c
index 8fe22706feb..02c6201f09a 100644
--- a/arch/xtensa/src/esp32/esp32_start.c
+++ b/arch/xtensa/src/esp32/esp32_start.c
@@ -186,6 +186,7 @@ MSPI_INIT_ATTR void sys_rtc_init(const soc_reset_reason_t 
*rst_reas)
       )
     {
       wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
+
       wdt_hal_write_protect_disable(&rtc_wdt_ctx);
       wdt_hal_disable(&rtc_wdt_ctx);
       wdt_hal_write_protect_enable(&rtc_wdt_ctx);
@@ -285,7 +286,9 @@ static noreturn_function void __esp32_start(void)
 
   /* Set .bss to zero */
 
+#  ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   memset(_sbss, 0, _ebss - _sbss);
+#  endif
 
 #endif
 
@@ -360,7 +363,7 @@ static noreturn_function void __esp32_start(void)
   /* Set external memory bss section to zero */
 
 #  ifdef CONFIG_XTENSA_EXTMEM_BSS
-     memset(_sbss_extmem, 0, _ebss_extmem - _sbss_extmem);
+  memset(_sbss_extmem, 0, _ebss_extmem - _sbss_extmem);
 #  endif
 
 #endif
diff --git a/arch/xtensa/src/esp32s2/esp32s2_start.c 
b/arch/xtensa/src/esp32s2/esp32s2_start.c
index 4d85c3c1eb0..2745aa7da78 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_start.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_start.c
@@ -210,10 +210,12 @@ static void noreturn_function IRAM_ATTR 
__esp32s2_start(void)
    * certain that there are no issues with the state of global variables.
    */
 
+#  ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   for (uint32_t *dest = (uint32_t *)_sbss; dest < (uint32_t *)_ebss; )
     {
       *dest++ = 0;
     }
+#  endif
 #endif
 
   /* Initialize peripherals parameters */
@@ -269,8 +271,8 @@ static void noreturn_function IRAM_ATTR 
__esp32s2_start(void)
 #  if defined(CONFIG_ESP32S2_SPIRAM_MEMTEST)
       if (esp_spiram_test() != OK)
         {
-            ets_printf("SPIRAM test failed\n");
-            PANIC();
+          ets_printf("SPIRAM test failed\n");
+          PANIC();
         }
 #  endif // CONFIG_ESP32S2_SPIRAM_MEMTEST
     }
diff --git a/arch/xtensa/src/esp32s3/esp32s3_start.c 
b/arch/xtensa/src/esp32s3/esp32s3_start.c
index 4e99f628137..4c4391003ac 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_start.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_start.c
@@ -559,10 +559,12 @@ noinstrument_function void IRAM_ATTR __start(void)
    * certain that there are no issues with the state of global variables.
    */
 
+#  ifndef CONFIG_ARCH_SKIP_ZERO_BSS
   for (uint32_t *dest = (uint32_t *)_sbss; dest < (uint32_t *)_ebss; )
     {
       *dest++ = 0;
     }
+#  endif
 #endif
 
   app_desc = esp_app_get_description();

Reply via email to