Fix align exception when startup

Author: xusiwei

bsp/nxp/imx/imx91/.config

@@ -116,14 +116,14 @@ CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
 # end of rt_strnlen options
 # end of klibc options
 
-CONFIG_RT_NAME_MAX=8
+CONFIG_RT_NAME_MAX=16
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
 # CONFIG_RT_USING_NANO is not set
 # CONFIG_RT_USING_SMART is not set
 # CONFIG_RT_USING_AMP is not set
 # CONFIG_RT_USING_SMP is not set
 CONFIG_RT_CPUS_NR=1
-CONFIG_RT_ALIGN_SIZE=8
+CONFIG_RT_ALIGN_SIZE=16
 # CONFIG_RT_THREAD_PRIORITY_8 is not set
 CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
@@ -135,10 +135,10 @@ CONFIG_RT_HOOK_USING_FUNC_PTR=y
 # CONFIG_RT_USING_HOOKLIST is not set
 CONFIG_RT_USING_IDLE_HOOK=y
 CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
-CONFIG_IDLE_THREAD_STACK_SIZE=1024
+CONFIG_IDLE_THREAD_STACK_SIZE=8192
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
-CONFIG_RT_TIMER_THREAD_STACK_SIZE=2048
+CONFIG_RT_TIMER_THREAD_STACK_SIZE=8192
 # CONFIG_RT_USING_TIMER_ALL_SOFT is not set
 # CONFIG_RT_USING_CPU_USAGE_TRACER is not set
 
@@ -201,11 +201,11 @@ CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
 #
 CONFIG_ARCH_TEXT_OFFSET=0x100000
 CONFIG_ARCH_RAM_OFFSET=0x80000000
-CONFIG_ARCH_SECONDARY_CPU_STACK_SIZE=16384
+CONFIG_ARCH_SECONDARY_CPU_STACK_SIZE=4096
 CONFIG_ARCH_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USING_GENERIC_CPUID=y
-CONFIG_ARCH_HEAP_SIZE=0x4000000
-CONFIG_ARCH_INIT_PAGE_SIZE=0x200000
+CONFIG_ARCH_HEAP_SIZE=0x2000000
+CONFIG_ARCH_INIT_PAGE_SIZE=0x8000000
 # end of AArch64 Architecture Configuration
 
 CONFIG_ARCH_CPU_64BIT=y
@@ -239,10 +239,11 @@ CONFIG_RT_USING_FINSH=y
 CONFIG_FINSH_USING_MSH=y
 CONFIG_FINSH_THREAD_NAME="tshell"
 CONFIG_FINSH_THREAD_PRIORITY=20
-CONFIG_FINSH_THREAD_STACK_SIZE=4096
+CONFIG_FINSH_THREAD_STACK_SIZE=8092
 CONFIG_FINSH_USING_HISTORY=y
 CONFIG_FINSH_HISTORY_LINES=5
 # CONFIG_FINSH_USING_WORD_OPERATION is not set
+# CONFIG_FINSH_USING_FUNC_EXT is not set
 CONFIG_FINSH_USING_SYMTAB=y
 CONFIG_FINSH_CMD_SIZE=80
 CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
@@ -1468,7 +1469,9 @@ CONFIG_SOC_MIMX91X1D=y
 #
 # Hardware Drivers Config
 #
+# CONFIG_BSP_USING_EARLY_CONSOLE is not set
 CONFIG_BSP_USING_UART1=y
 CONFIG_BSP_USING_GIC=y
 CONFIG_BSP_USING_GICV3=y
+CONFIG_KERNEL_ASPACE_START=0x80100000
 # end of Hardware Drivers Config

bsp/nxp/imx/imx91/addr2line.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+aarch64-none-elf-addr2line -e rtthread.elf -a -f $*

bsp/nxp/imx/imx91/drivers/Kconfig

@@ -1,5 +1,9 @@
 menu "Hardware Drivers Config"
 
+config BSP_USING_EARLY_CONSOLE
+    bool "Enable early console"
+    default n
+
 config BSP_USING_UART1
     bool "Enable UART1"
     default y
@@ -12,4 +16,8 @@ config BSP_USING_GICV3
     bool "Enable GICv3"
     default y
 
+config KERNEL_ASPACE_START
+    hex "Kernel aspace start address"
+    default 0x80100000
+
 endmenu

bsp/nxp/imx/imx91/drivers/board.c

@@ -22,10 +22,20 @@
 
 #include <limits.h>
 
+#define DRAM_MAP_START 0x80100000
+#define DRAM_MAP_SIZE (64 * 1024 * 1024) // part of DRAM
+
+#define PERIPH_MAP_START 0x44000000
+#define PERIPH_MAP_SIZE (0x10000000)
+
+#define PERIPH_VADDR_START 0xD4000000
+
+#define MEM_DESC(vaddr_start, size, paddr_start, attr) \
+    vaddr_start, (vaddr_start + size - 1uL), paddr_start, attr
 
 struct mem_desc platform_mem_desc[] = {
-    {0x80100000, 0x8FFFFFFF, 0x80000000, NORMAL_MEM},
-    {0xD4000000, 0xDFFFFFFF, 0x44380000, DEVICE_MEM},
+    {MEM_DESC(KERNEL_VADDR_START, DRAM_MAP_SIZE, DRAM_MAP_START, NORMAL_MEM)},
+    {MEM_DESC(PERIPH_VADDR_START, PERIPH_MAP_SIZE, PERIPH_MAP_START, DEVICE_MEM)},
 };
 
 const rt_uint32_t platform_mem_desc_size = sizeof(platform_mem_desc)/sizeof(platform_mem_desc[0]);
@@ -37,52 +47,11 @@ rt_region_t init_page_region = {
 
 extern unsigned long MMUTable[];
 
-static void rt_hw_timer_isr(int vector, void *param)
-{
-    rt_tick_increase();
-    // epit_get_compare_event(HW_EPIT1);
-}
-
-int rt_hw_timer_init(void)
-{
-    uint32_t freq;
-
-    // Make sure the timer is off.
-    // HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 0;
-
-    // HW_ARMGLOBALTIMER_CONTROL.B.FCR0 =1;
-
-    // HW_ARMGLOBALTIMER_CONTROL.B.FCR1 =0;
-
-    // HW_ARMGLOBALTIMER_CONTROL.B.DBG_ENABLE =0;
-
-    // // Clear counter.
-    // HW_ARMGLOBALTIMER_COUNTER_HI_WR(0);
-    // HW_ARMGLOBALTIMER_COUNTER_LO_WR(0);
-
-    // // Now turn on the timer.
-    // HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 1;
-
-    // freq = get_main_clock(IPG_CLK);
-
-    // epit_init(HW_EPIT1, CLKSRC_IPG_CLK, freq / 1000000,
-    //           SET_AND_FORGET, 10000, WAIT_MODE_EN | STOP_MODE_EN);
-
-    // epit_counter_enable(HW_EPIT1, 10000, IRQ_MODE);
-
-    // rt_hw_interrupt_install(IMX_INT_EPIT1, rt_hw_timer_isr, RT_NULL, "tick");
-    // rt_hw_interrupt_umask(IMX_INT_EPIT1);
-
-    return 0;
-}
-INIT_BOARD_EXPORT(rt_hw_timer_init);
-
 /**
  * This function will initialize hardware board
  */
 void rt_hw_board_init(void)
 {
-    // enable_neon_fpu();
     // disable_strict_align_check();
     rt_hw_earlycon_ioremap();
 
@@ -120,10 +89,9 @@ void rt_hw_board_init(void)
 
     rt_components_board_init();
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
+    rt_hw_console_output("[rt_hw_board_init] rt_console_set_device done!\n");
 
-    rt_hw_console_output("[rt_hw_board_init] rt_hw_board_init done!\n");
     rt_kprintf("[rt_hw_board_init] rt_kprintf works!\n");
-    rt_hw_console_output("[rt_hw_board_init] rt_hw_board_init done!!\n");
 }
 
 /*@}*/

bsp/nxp/imx/imx91/drivers/board.h

@@ -25,6 +25,10 @@ extern int __bss_end;
 #define HEAP_BEGIN      ((void*)&__bss_end)
 #endif
 
+#ifndef KERNEL_VADDR_START
+#define KERNEL_VADDR_START (ARCH_RAM_OFFSET + ARCH_TEXT_OFFSET)
+#endif
+
 #define HEAP_END        (void*)(HEAP_BEGIN + 32 * 1024 * 1024)
 #define PAGE_START      HEAP_END
 #define PAGE_END        ((size_t)PAGE_START + 128 * 1024 * 1024)

bsp/nxp/imx/imx91/drivers/sdk/drivers/lpuart/fsl_lpuart.c

@@ -660,7 +660,6 @@ void LPUART_GetDefaultConfig(lpuart_config_t *config)
 {
     assert(NULL != config);
 
-    rt_hw_console_output("LPUART_GetDefaultConfig start!\n");
     /* Initializes the configure structure to zero. */
     (void)memset(config, 0, sizeof(*config));
 
@@ -688,7 +687,6 @@ void LPUART_GetDefaultConfig(lpuart_config_t *config)
 #if defined(FSL_FEATURE_LPUART_HAS_CTRL_SWAP) && FSL_FEATURE_LPUART_HAS_CTRL_SWAP
     config->swapTxdRxd   = false;
 #endif
-    rt_hw_console_output("LPUART_GetDefaultConfig done!\n");
 }
 
 /*!

bsp/nxp/imx/imx91/drivers/serial.c

@@ -64,49 +64,16 @@ static void rt_hw_uart_isr(int irqn, void *param)
 
 static rt_err_t uart_configure(struct rt_serial_device *serial, struct serial_configure *cfg)
 {
-    // struct hw_uart_device *uart;
-    // uint32_t baudrate;
-    // uint8_t parity, stopbits, datasize, flowcontrol;
-
-    // RT_ASSERT(serial != RT_NULL);
-    // uart = (struct hw_uart_device *)serial->parent.user_data;
-
-    // baudrate = cfg->baud_rate;
-    // switch (cfg->data_bits)
-    // {
-    // case DATA_BITS_8:
-    //     datasize = EIGHTBITS;
-    //     break;
-    // case DATA_BITS_7:
-    //     datasize = SEVENBITS;
-    //     break;
-    // }
-    // if (cfg->stop_bits == STOP_BITS_1) stopbits = STOPBITS_ONE;
-    // else if (cfg->stop_bits == STOP_BITS_2) stopbits = STOPBITS_TWO;
-
-    // parity = PARITY_NONE;
-    // flowcontrol = FLOWCTRL_OFF;
-
-    // /* Initialize UART */
-    // uart_init(uart->uart_base, baudrate, parity, stopbits, datasize, flowcontrol);
-
-    // rt_hw_interrupt_install(uart->irqn, rt_hw_uart_isr, serial, "uart");
-    // rt_hw_interrupt_mask(uart->irqn);
-
-    // /* Set the IRQ mode for the Rx FIFO */
-    // uart_set_FIFO_mode(uart->uart_base, RX_FIFO, 1, IRQ_MODE);
-
     struct hw_uart_device *uart = RT_NULL;
     static lpuart_config_t config;
 
-    rt_hw_console_output("uart_configure start ...\n");
     RT_ASSERT(serial != RT_NULL);
     uart = (struct hw_uart_device *)serial->parent.user_data;
 
-    rt_hw_console_output("uart_configure LPUART_GetDefaultConfig ...\n");
+    rt_hw_console_output("uart_configure start ...\n");
     LPUART_GetDefaultConfig(&config);
-    rt_hw_console_output("uart_configure LPUART_GetDefaultConfig done!\n");
 
+    // baud rate
     config.baudRate_Bps = cfg->baud_rate;
 
     // data bits
@@ -240,8 +207,9 @@ static int uart_putc(struct rt_serial_device *serial, char c)
     return 1;
 }
 
-volatile LPUART_Type *earlycon_base = LPUART1;
-const size_t earlycon_size = 4096; // sizeof(LPUART_Type);
+#if USING_EARLY_CONSOLE
+LPUART_Type *earlycon_base = LPUART1;
+const size_t earlycon_size = 4096;
 
 void rt_hw_earlycon_ioremap(void)
 {
@@ -282,6 +250,7 @@ void rt_hw_earlycon_print_hex(const char *str, rt_base_t hex)
     rt_hw_earlycon_putc('\r');
     rt_hw_earlycon_putc('\n');
 }
+#endif
 
 void rt_hw_console_putc(char c)
 {
@@ -352,7 +321,8 @@ int rt_hw_uart_init(void)
             hw_uart_devices[i]->serial.ops = &_uart_ops;
             hw_uart_devices[i]->serial.config = config;
             rt_hw_earlycon_print_hex("ioremap uart_instance: ", (rt_base_t)hw_uart_devices[i]->uart_instance);
-            hw_uart_devices[i]->uart_base = rt_ioremap((void *)hw_uart_devices[i]->uart_instance, 0x1000);
+            // hw_uart_devices[i]->uart_base = rt_ioremap((void *)hw_uart_devices[i]->uart_instance, 0x1000);
+            hw_uart_devices[i]->uart_base = rt_ioremap_early((void *)hw_uart_devices[i]->uart_instance, 0x1000);
 
             rt_hw_serial_register(&hw_uart_devices[i]->serial, hw_uart_devices[i]->device_name,
                                   RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, hw_uart_devices[i]);
@@ -361,4 +331,3 @@ int rt_hw_uart_init(void)
 
     return 0;
 }
-// INIT_BOARD_EXPORT(rt_hw_uart_init);

bsp/nxp/imx/imx91/drivers/serial.h

@@ -17,10 +17,23 @@
 
 int rt_hw_uart_init(void);
 
+#ifdef BSP_USING_EARLY_CONSOLE
+#define USING_EARLY_CONSOLE 1
+#else
+#define USING_EARLY_CONSOLE 0
+#endif
+
+#if USING_EARLY_CONSOLE
 void rt_hw_earlycon_ioremap(void);
 void rt_hw_earlycon_putc(char c);
 void rt_hw_earlycon_puts(const char *str);
 void rt_hw_earlycon_print_hex(const char *str, rt_base_t hex);
+#else
+static inline void rt_hw_earlycon_ioremap(void) {}
+static inline void rt_hw_earlycon_putc(char) {}
+static inline void rt_hw_earlycon_puts(const char *) {}
+static inline void rt_hw_earlycon_print_hex(const char *, rt_base_t) {}
+#endif
 
 void rt_hw_console_putc(char c);
 void rt_hw_console_output(const char *str);

bsp/nxp/imx/imx91/rtconfig.h

@@ -72,9 +72,9 @@
 
 /* end of rt_strnlen options */
 /* end of klibc options */
-#define RT_NAME_MAX 8
+#define RT_NAME_MAX 16
 #define RT_CPUS_NR 1
-#define RT_ALIGN_SIZE 8
+#define RT_ALIGN_SIZE 16
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 1000
@@ -83,10 +83,10 @@
 #define RT_HOOK_USING_FUNC_PTR
 #define RT_USING_IDLE_HOOK
 #define RT_IDLE_HOOK_LIST_SIZE 4
-#define IDLE_THREAD_STACK_SIZE 1024
+#define IDLE_THREAD_STACK_SIZE 8192
 #define RT_USING_TIMER_SOFT
 #define RT_TIMER_THREAD_PRIO 4
-#define RT_TIMER_THREAD_STACK_SIZE 2048
+#define RT_TIMER_THREAD_STACK_SIZE 8192
 
 /* kservice options */
 
@@ -125,11 +125,11 @@
 
 #define ARCH_TEXT_OFFSET 0x100000
 #define ARCH_RAM_OFFSET 0x80000000
-#define ARCH_SECONDARY_CPU_STACK_SIZE 16384
+#define ARCH_SECONDARY_CPU_STACK_SIZE 4096
 #define ARCH_HAVE_EFFICIENT_UNALIGNED_ACCESS
 #define ARCH_USING_GENERIC_CPUID
-#define ARCH_HEAP_SIZE 0x4000000
-#define ARCH_INIT_PAGE_SIZE 0x200000
+#define ARCH_HEAP_SIZE 0x2000000
+#define ARCH_INIT_PAGE_SIZE 0x8000000
 /* end of AArch64 Architecture Configuration */
 #define ARCH_CPU_64BIT
 #define RT_USING_CACHE
@@ -159,7 +159,7 @@
 #define FINSH_USING_MSH
 #define FINSH_THREAD_NAME "tshell"
 #define FINSH_THREAD_PRIORITY 20
-#define FINSH_THREAD_STACK_SIZE 4096
+#define FINSH_THREAD_STACK_SIZE 8092
 #define FINSH_USING_HISTORY
 #define FINSH_HISTORY_LINES 5
 #define FINSH_USING_SYMTAB
@@ -461,6 +461,7 @@
 #define BSP_USING_UART1
 #define BSP_USING_GIC
 #define BSP_USING_GICV3
+#define KERNEL_ASPACE_START 0x80100000
 /* end of Hardware Drivers Config */
 
 #endif

bsp/nxp/imx/imx91/rtconfig.py

@@ -39,12 +39,13 @@
     OBJCPY = PREFIX + 'objcopy'
 
     DEVICE = ' -march=armv8-a -mtune=cortex-a55'
+    DEVICE += ' -fno-omit-frame-pointer -ffunction-sections -fdata-sections'
     CPPFLAGS = ' -E -P -x assembler-with-cpp'
-    CFLAGS = DEVICE + ' -Wall -Wno-cpp -D_POSIX_SOURCE'
+    CFLAGS = DEVICE + ' -Wall -Wno-cpp'
+    CFLAGS += ' -mstrict-align' # disable unaligned access
+    CFLAGS += ' -Dmemcmp=rt_memcmp -Dstrcmp=rt_strcmp -Dstrcpy=rt_strcpy -Dstrlen=rt_strlen' # use rtthread string operations
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -D__ASSEMBLY__'
-    LINK_SCRIPT = 'link.lds'
-    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors'+\
-                      ' -T %s' % LINK_SCRIPT
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors -T link.lds'
 
     CPATH = ''
     LPATH = ''