[nrf fromlist] soc: nordic: nrf54h: Disable code relocation for MCUBOOT

adamkondraciuk · adamkondraciuk · commit 158be952dde1 · 2025-10-01T16:38:46.000+02:00
MCUBOOT requires LTO to be enabled, while using code relocation
forces switching it off. When `__ramfunc` is used, LTO can also
be used. Then the `cache_retain_and_sleep` function will execute
properly, but a bit slower.

Upstream PR #:

Signed-off-by: Adam Kondraciuk &lt;adam.kondraciuk@nordicsemi.no&gt;
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -15,6 +15,6 @@ config POWER_DOMAIN
 	default y
 
 config CODE_DATA_RELOCATION
-	default y if PM || POWEROFF
+	default y if (PM || POWEROFF) && !MCUBOOT
 
 endif # SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
@@ -88,7 +88,12 @@ void nrf_poweroff(void)
 	CODE_UNREACHABLE;
 }
 
-static __attribute__((__used__, noinline)) void cache_retain_and_sleep(void)
+#if CONFIG_MCUBOOT
+static __ramfunc
+#else
+static __attribute__((__used__, noinline))
+#endif
+void cache_retain_and_sleep(void)
 {
 	nrf_cache_task_trigger(NRF_DCACHE, NRF_CACHE_TASK_SAVE);
 	nrf_cache_task_trigger(NRF_ICACHE, NRF_CACHE_TASK_SAVE);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,12 @@ void nrf_poweroff(void)`
`88`	`88`	`CODE_UNREACHABLE;`
`89`	`89`	`}`
`90`	`90`
`91`		`-static __attribute__((__used__, noinline)) void cache_retain_and_sleep(void)`
	`91`	`+#if CONFIG_MCUBOOT`
	`92`	`+static __ramfunc`
	`93`	`+#else`
	`94`	`+static __attribute__((__used__, noinline))`
	`95`	`+#endif`
	`96`	`+void cache_retain_and_sleep(void)`
`92`	`97`	`{`
`93`	`98`	`nrf_cache_task_trigger(NRF_DCACHE, NRF_CACHE_TASK_SAVE);`
`94`	`99`	`nrf_cache_task_trigger(NRF_ICACHE, NRF_CACHE_TASK_SAVE);`