[nrf noup] mgmt: mcumgr: grp: img_mgmt: Add handling for QSPI XIP

Adds handling code to allow selecting the correct image slot when
using QSPI XIP in DirectXIP mode

In case of Direct XIP and multiple images, the radio active slot changes
accordingly (i.e. application slot 1 boots radio slot 1).

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
(cherry picked from commit a5b67c1)

Author: nordicjm

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig

@@ -219,6 +219,14 @@ config MCUMGR_GRP_IMG_SLOT_INFO_HOOKS
 	  This will enable the slot info function hooks which can be used to add additional
 	  information to responses.
 
+config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	bool "QSPI XIP Split image mode"
+	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
+	help
+	  This option should not be selected by users and should automatically be selected by
+	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
+	  split image application in DirectXIP mode.
+
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

@@ -235,6 +235,14 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP or RAM load currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE) ||                                         \
+	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP) ||                                      \
+	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT)
+	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		slot += 1;
+	}
+#endif
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 	/* RAM load requires querying bootloader */
 	int rc;