fix regresion from apache#14881

reason: svc call may trigger hardfalt Signed-off-by: hujun5 <[email protected]>
hujun260 · Dec 6, 2024 · 545d0ce · 545d0ce
1 parent 1e49cb4
commit 545d0ce
Show file tree

Hide file tree

Showing 88 changed files with 14 additions and 86 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -864,6 +864,7 @@ config ARCH_ARMV7M
 	select ARCH_HAVE_CPUINFO
 	select ARCH_HAVE_DEBUG
 	select ARCH_HAVE_PERF_EVENTS
+	select ARMV7M_USEBASEPRI
 
 config ARCH_CORTEXM3
 	bool
@@ -1011,6 +1012,7 @@ config ARCH_ARMV8M
 	select ARCH_HAVE_CPUINFO
 	select ARCH_HAVE_DEBUG
 	select ARCH_HAVE_PERF_EVENTS
+	select ARMV8M_USEBASEPRI
 
 config ARCH_CORTEXM23
 	bool

diff --git a/arch/arm/src/armv6-m/arm_doirq.c b/arch/arm/src/armv6-m/arm_doirq.c
@@ -65,7 +65,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
    * is invalid, and we can safely overwrite it.
    */
 
-  if (!(NVIC_IRQ_SVCALL == irq && regs[REG_R0] == SYS_restore_context))
+  if (*running_task != NULL)
     {
       tcb->xcp.regs = regs;
     }

diff --git a/arch/arm/src/armv6-m/arm_sigdeliver.c b/arch/arm/src/armv6-m/arm_sigdeliver.c
@@ -165,6 +165,7 @@ void arm_sigdeliver(void)
   rtcb->irqcount--;
 #endif
 
+  g_running_tasks[this_cpu()] = NULL;
   rtcb->xcp.regs = rtcb->xcp.saved_regs;
   arm_fullcontextrestore();
   UNUSED(regs);

diff --git a/arch/arm/src/common/arm_exit.c b/arch/arm/src/common/arm_exit.c
@@ -60,9 +60,18 @@ void up_exit(int status)
 
   nxtask_exit();
 
-  /* Scheduler parameters will update inside syscall */
+  /* Update g_running_tasks */
 
+#ifdef CONFIG_ARCH_ARMV6M
+  /* ARMV6M syscal may trigger hard fault， We use
+   * running_task != NULL to determine whether it is
+   * a context for restoration.
+   */
+
+  g_running_tasks[this_cpu()] = NULL;
+#else
   g_running_tasks[this_cpu()] = this_task();
+#endif
 
   /* Then switch contexts */
 

diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARD_LOOPSPERMSEC=5434

diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y

diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/charger/defconfig b/boards/arm/cxd56xx/spresense/configs/charger/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BINFMT_CONSTRUCTORS=y
 CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y

diff --git a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/fmsynth/defconfig b/boards/arm/cxd56xx/spresense/configs/fmsynth/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIOUTILS_FMSYNTH_LIB=y
 CONFIG_AUDIOUTILS_MMLPARSER_LIB=y

diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=5434

diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/nsh_automount/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh_automount/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
@@ -14,7 +14,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_ROMDISK=y

diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_LEDS_CPU_ACTIVITY=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARDCTL_RESET=y

diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_LEDS_CPU_ACTIVITY=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARDCTL_RESET=y

diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_LEDS_CPU_ACTIVITY=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARDCTL_RESET=y

diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_LEDS_CPU_ACTIVITY=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=5434

diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD_SPRESENSE=y
 CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=5434
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_CHIP="cxd56xx"
 CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARDCTL_RESET=y

diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@@ -21,7 +21,6 @@ CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_LEDS_CPU_ACTIVITY=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_AUDIO=y
 CONFIG_AUDIO_CXD56=y
 CONFIG_BOARDCTL_RESET=y

diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_FULLOPT=y

diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_FULLOPT=y

diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
@@ -18,7 +18,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_FEATURES=y

diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARM_MPU=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILD_PROTECTED=y

diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_ETH0_PHY_KSZ8081=y

diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
@@ -15,7 +15,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_FS_PROCFS=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_CAN=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
@@ -18,7 +18,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_CAN=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_ITCM=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARM_MPU=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILD_PROTECTED=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DRIVERS_VIDEO=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_ETH0_PHY_KSZ8081=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh_dcache_wb/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh_dcache_wb/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_BUSFAULT=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
@@ -15,7 +15,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_FS_PROCFS=y

diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BOOT_RUNFROMISRAM=y
 CONFIG_BUILTIN=y

diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/can/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_CAN=y

diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/canfd/defconfig
@@ -18,7 +18,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_CAN=y

diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/knsh/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARM_MPU=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILD_PROTECTED=y

diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_DRIVERS_VIDEO=y

diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/mcuboot-app/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/mcuboot-app/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y