samples: boards: nrf: system_off: Add nrf54h20 support

Author: nordic-krch

samples/boards/nordic/system_off/Kconfig.sysbuild

@@ -0,0 +1,9 @@
+# Copyright 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config REMOTE_CORE_BOARD
+string
+	default "nrf54h20dk/nrf54h20/cpurad" if $(BOARD) = "nrf54h20dk"

samples/boards/nordic/system_off/remote/CMakeLists.txt

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(nrf_system_off_remote)
+
+target_sources(app PRIVATE src/main.c)

samples/boards/nordic/system_off/remote/prj.conf

@@ -0,0 +1,2 @@
+CONFIG_PM_DEVICE=y
+CONFIG_POWEROFF=y

samples/boards/nordic/system_off/remote/src/main.c

@@ -0,0 +1,31 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/poweroff.h>
+#include <hal/nrf_memconf.h>
+
+int main(void)
+{
+	int rc;
+	const struct device *const cons = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+
+	printf("%s system off demo. Ready for system off.\n", CONFIG_BOARD);
+
+	rc = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
+	if (rc < 0) {
+		printf("Could not suspend console (%d)\n", rc);
+		return 0;
+	}
+
+	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_MASK, false);
+	nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_MASK, false);
+
+	sys_poweroff();
+
+	return 0;
+}

samples/boards/nordic/system_off/src/main.c

@@ -28,6 +28,7 @@
 static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
+static const uint32_t port_sw1 = DT_PROP(DT_GPIO_CTLR_BY_IDX(DT_ALIAS(sw1), gpios, 0), port);
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
 #endif
 
@@ -60,12 +61,19 @@ int main(void)
 	int rc;
 	uint32_t reset_cause;
 	const struct device *const cons = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+	uint32_t nrf_pin_sw1 = 32 * port_sw1 + sw1.pin;
+	bool do_poweroff = true;
 
 	if (!device_is_ready(cons)) {
 		printf("%s: device not ready.\n", cons->name);
 		return 0;
 	}
 
+	if (nrf_gpio_pin_latch_get(nrf_pin_sw1)) {
+		nrf_gpio_pin_latch_clear(nrf_pin_sw1);
+		do_poweroff = false;
+	}
+
 	printf("\n%s system off demo\n", CONFIG_BOARD);
 	hwinfo_get_reset_cause(&reset_cause);
 	rc = print_reset_cause(reset_cause);
@@ -114,20 +122,37 @@ int main(void)
 		return 0;
 	}
 
+	rc = gpio_pin_configure_dt(&sw1, GPIO_INPUT);
+	if (rc < 0) {
+		printf("Could not configure sw1 GPIO (%d)\n", rc);
+		return 0;
+	}
+
 	rc = gpio_pin_interrupt_configure_dt(&sw0, GPIO_INT_LEVEL_ACTIVE);
 	if (rc < 0) {
 		printf("Could not configure sw0 GPIO interrupt (%d)\n", rc);
 		return 0;
 	}
-
-	printf("Entering system off; press sw0 to restart\n");
+	//code reorder needed
 #endif
 #if defined(CONFIG_LPCOMP_WAKEUP_ENABLE)
 	comparator_set_trigger(comp_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
 	comparator_trigger_is_pending(comp_dev);
 	printf("Entering system off; change signal level at comparator input to restart\n");
 #endif
 
+	rc = gpio_pin_interrupt_configure_dt(&sw1, GPIO_INT_LEVEL_ACTIVE);
+	if (rc < 0) {
+		printf("Could not configure sw0 GPIO interrupt (%d)\n", rc);
+		return 0;
+	}
+
+	if (do_poweroff) {
+		printf("Entering system off; press sw0 or sw1 to restart\n");
+	} else {
+		printf("Button sw1 pressed, not entering system off\n");
+	}
+
 	rc = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
 	if (rc < 0) {
 		printf("Could not suspend console (%d)\n", rc);
@@ -140,6 +165,17 @@ int main(void)
 		retained_update();
 	}
 
+	if (do_poweroff) {
+#if CONFIG_SOC_NRF54H20_CPUAPP
+		/* Local RAM0 (TCM) is currently not used so retention can be disabled. */
+		nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, RAMBLOCK_RET_MASK, false);
+		nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 1, RAMBLOCK_RET_MASK, false);
+#endif
+		sys_poweroff();
+	} else {
+		k_sleep(K_FOREVER);
+	}
+
 	hwinfo_clear_reset_cause();
 	sys_poweroff();
 

samples/boards/nordic/system_off/sysbuild.cmake

@@ -0,0 +1,22 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if("${SB_CONFIG_REMOTE_CORE_BOARD}" STREQUAL "")
+	message(FATAL_ERROR
+	"Target ${BOARD} not supported for this sample. "
+	"There is no remote board selected in Kconfig.sysbuild")
+endif()
+
+set(REMOTE_APP remote)
+
+ExternalZephyrProject_Add(
+	APPLICATION ${REMOTE_APP}
+	SOURCE_DIR  ${APP_DIR}/${REMOTE_APP}
+	BOARD       ${SB_CONFIG_REMOTE_CORE_BOARD}
+)
+
+# Add dependencies so that the remote sample will be built first
+# This is required because some primary cores need information from the
+# remote core's build, such as the output image's LMA
+add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP})
+sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} ${REMOTE_APP})

soc/nordic/nrf54h/soc.c

@@ -147,7 +147,18 @@ void soc_early_init_hook(void)
 {
 	int err;
 
+	if (IS_ENABLED(CONFIG_ICACHE)) {
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+						RAMBLOCK_CONTROL_BIT_ICACHE, true);
+	}
+
 	sys_cache_instr_enable();
+
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+						RAMBLOCK_CONTROL_BIT_DCACHE, true);
+	}
+
 	sys_cache_data_enable();
 
 	power_domain_init();