arch: arm: Don't use STKALIGN mask on ARMv8-M Baseline

mrkhldn · mrkhldn · commit 06da9a7fe019 · 2024-11-14T09:02:14.000-08:00
The STKALIGN mask is not present for CONFIG_ARMV8_M_BASELINE as
well as CONFIG_ARMV8_M_MAINLINE. So filter out that check when
setting the sp for ARM core dumps.

Signed-off-by: Mark Holden &lt;mholden@meta.com&gt;
diff --git a/arch/arm/include/cortex_m/exception.h b/arch/arm/include/cortex_m/exception.h
@@ -258,7 +258,7 @@ static ALWAYS_INLINE void z_arm_set_fault_sp(const struct arch_esf *esf, uint32_
 	}
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 
-#ifndef CONFIG_ARMV8_M_MAINLINE
+#if !(defined(CONFIG_ARMV8_M_MAINLINE) || defined(CONFIG_ARMV8_M_BASELINE))
 	if ((esf->basic.xpsr & SCB_CCR_STKALIGN_Msk) == SCB_CCR_STKALIGN_Msk) {
 		/* Adjust stack alignment after PSR bit[9] detected */
 		z_arm_coredump_fault_sp |= 0x4;

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static ALWAYS_INLINE void z_arm_set_fault_sp(const struct arch_esf *esf, uint32_`
`258`	`258`	`}`
`259`	`259`	`#endif /* CONFIG_FPU && CONFIG_FPU_SHARING */`
`260`	`260`
`261`		`-#ifndef CONFIG_ARMV8_M_MAINLINE`
	`261`	`+#if !(defined(CONFIG_ARMV8_M_MAINLINE) \|\| defined(CONFIG_ARMV8_M_BASELINE))`
`262`	`262`	`if ((esf->basic.xpsr & SCB_CCR_STKALIGN_Msk) == SCB_CCR_STKALIGN_Msk) {`
`263`	`263`	`/* Adjust stack alignment after PSR bit[9] detected */`
`264`	`264`	`z_arm_coredump_fault_sp \|= 0x4;`