applications: nrf_desktop: adapt dfu_mcumgr to the nRF54H20 DFU solution

Adapted the DFU MCUmgr module in the nRF Desktop application so that it
can work with the new DFU solution for the nRF54H20 SoC.

Removed all module mentions of the old DFU solution for the nRF54H20 SoC
called SUIT.

Ref: NCSDK-34151

Signed-off-by: Kamil Piszczek <[email protected]>

Author: kapi-no

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf

@@ -57,9 +57,11 @@ CONFIG_DESKTOP_BLE_LOW_LATENCY_LOCK=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_OUT_REPORT=y
 
+CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
+CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n
+
 # Temporarily disable unsupported features.
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=n
-CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=n
 
 ################################################################################
 # Zephyr Configuration
@@ -101,6 +103,27 @@ CONFIG_UDC_DWC2_DMA=n
 CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_ID_MAX=3
 
+# Enable MCUmgr Bluetooth transport
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT=y
+
+# Allow for large Bluetooth data packets.
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+
+# Enable the MCUmgr Packet Reassembly feature over Bluetooth and its configuration dependencies.
+# MCUmgr buffer size is optimized to fit one SMP packet divided into five Bluetooth Write Commands,
+# transmitted with the maximum possible MTU value: 498 bytes.
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4096
+
+# Allow a DFU host to retrieve information about the number and size of MCUmgr buffers.
+# The nRF Connect Device Manager uses this information to speed up the DFU.
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
+
 # Configure Zephyr system power management
 CONFIG_PM=y
 CONFIG_PM_S2RAM=y

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf

@@ -53,9 +53,10 @@ CONFIG_DESKTOP_FAILSAFE_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_OUT_REPORT=y
 
+CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y
+
 # Temporarily disable unsupported features.
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=n
-CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=n
 
 ################################################################################
 # Zephyr Configuration
@@ -96,6 +97,27 @@ CONFIG_UDC_DWC2_DMA=n
 CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_ID_MAX=3
 
+# Enable MCUmgr Bluetooth transport
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT=y
+
+# Allow for large Bluetooth data packets.
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+
+# Enable the MCUmgr Packet Reassembly feature over Bluetooth and its configuration dependencies.
+# MCUmgr buffer size is optimized to fit one SMP packet divided into five Bluetooth Write Commands,
+# transmitted with the maximum possible MTU value: 498 bytes.
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4096
+
+# Allow a DFU host to retrieve information about the number and size of MCUmgr buffers.
+# The nRF Connect Device Manager uses this information to speed up the DFU.
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
+
 # Configure Zephyr system power management
 CONFIG_PM=y
 CONFIG_PM_S2RAM=y

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/prj.conf

@@ -34,6 +34,11 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
 CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
 CONFIG_BT_CTLR_PRIVACY=y
 
+# Allow for large Bluetooth data packets.
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
 # Disable reset on fatal error for better debugging experience.
 CONFIG_RESET_ON_FATAL_ERROR=n
 

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/prj_release.conf

@@ -34,6 +34,11 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
 CONFIG_BT_CTLR_FILTER_ACCEPT_LIST=y
 CONFIG_BT_CTLR_PRIVACY=y
 
+# Allow for large Bluetooth data packets.
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
 # Improve firmware reliability.
 CONFIG_RESET_ON_FATAL_ERROR=y
 

applications/nrf_desktop/src/modules/Kconfig.dfu_mcumgr

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Nordic Semiconductor ASA
+# Copyright (c) 2023-2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
@@ -8,6 +8,7 @@ menuconfig DESKTOP_DFU_MCUMGR_ENABLE
 	bool "Enable DFU using MCUmgr [EXPERIMENTAL]"
 	select EXPERIMENTAL
 	select CAF_BLE_SMP_TRANSFER_EVENTS if MCUMGR_TRANSPORT_BT
+	select DESKTOP_DFU_MCUMGR_MCUBOOT_DEPS
 	select MCUMGR
 	select MCUMGR_GRP_OS
 	select MCUMGR_GRP_OS_BOOTLOADER_INFO
@@ -18,12 +19,24 @@ menuconfig DESKTOP_DFU_MCUMGR_ENABLE
 	select FLASH
 	select FLASH_MAP
 	select ZCBOR
+	depends on BOOTLOADER_MCUBOOT
 	help
 	  This option enables an alternative method of performing DFU using the
 	  MCUmgr module.
 
 if DESKTOP_DFU_MCUMGR_ENABLE
 
+config DESKTOP_DFU_MCUMGR_MCUBOOT_DEPS
+	bool
+	select MCUBOOT_BOOTUTIL_LIB
+	select IMG_MANAGER
+	select MCUMGR_GRP_IMG
+	select MCUMGR_GRP_IMG_MUTEX if DESKTOP_DFU_LOCK
+	select STREAM_FLASH
+	help
+	  This option is used to logically group the MCUboot bootloader dependencies in the MCUmgr DFU
+	  module. The MCUboot bootloader is the only supported bootloader for this module.
+
 config DESKTOP_DFU_MCUMGR_MCUBOOT_DIRECT_XIP
 	bool "Device uses MCUboot bootloader in direct-xip mode"
 	default y if MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
@@ -38,35 +51,6 @@ config DESKTOP_DFU_MCUMGR_MCUBOOT_DIRECT_XIP
 	  boots the image with a higher version. The module does not confirm the
 	  newly updated image after a successful boot.
 
-choice DESKTOP_DFU_MCUMGR_BACKEND
-	prompt "Choose DFU backend"
-	default DESKTOP_DFU_BACKEND_MCUBOOT if BOOTLOADER_MCUBOOT
-	default DESKTOP_DFU_BACKEND_SUIT if SUIT
-
-config DESKTOP_DFU_BACKEND_MCUBOOT
-	bool "Use MCUboot as DFU backend"
-	select MCUBOOT_BOOTUTIL_LIB
-	select IMG_MANAGER
-	select MCUMGR_GRP_IMG
-	select MCUMGR_GRP_IMG_MUTEX if DESKTOP_DFU_LOCK
-	select STREAM_FLASH
-	depends on BOOTLOADER_MCUBOOT
-	help
-	  This option enables the MCUboot bootloader as the backend for the MCUmgr DFU module.
-
-config DESKTOP_DFU_BACKEND_SUIT
-	bool "Use SUIT as DFU backend"
-	select MCUMGR_SMP_LEGACY_RC_BEHAVIOUR
-	select MGMT_SUITFU
-	select MGMT_SUITFU_GRP_SUIT
-	select SSF_SUIT_SERVICE_ENABLED
-	select ZCBOR_CANONICAL
-	depends on SUIT
-	help
-	  This option enables the SUIT as the backend for the MCUmgr DFU module.
-
-endchoice
-
 module = DESKTOP_DFU_MCUMGR
 module-str = DFU MCUmgr
 source "subsys/logging/Kconfig.template.log_config"

applications/nrf_desktop/src/modules/dfu_mcumgr.c

@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 #include <zephyr/kernel.h>
 
-#if defined CONFIG_DESKTOP_DFU_BACKEND_MCUBOOT
 #include <zephyr/dfu/mcuboot.h>
 #include <zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h>
-#elif defined CONFIG_DESKTOP_DFU_BACKEND_SUIT
-#include <sdfw/sdfw_services/suit_service.h>
-#include <dfu/suit_dfu.h>
-#endif
 
 #include <zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h>
 #include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
@@ -45,16 +40,7 @@ static void dfu_lock_owner_changed(const struct dfu_lock_owner *new_owner)
 	/* The function declaration is not included in MCUmgr's header file if the mutex locking
 	 * of the image management state object is disabled.
 	 */
-#if defined CONFIG_DESKTOP_DFU_BACKEND_MCUBOOT
 	img_mgmt_reset_upload();
-#elif defined CONFIG_DESKTOP_DFU_BACKEND_SUIT
-	int err = suit_dfu_cleanup();
-
-	if (err) {
-		module_set_state(MODULE_STATE_ERROR);
-		LOG_ERR("Failed to cleanup SUIT DFU: %d", err);
-	}
-#endif
 #endif /* CONFIG_DESKTOP_DFU_LOCK */
 }
 
@@ -75,19 +61,6 @@ static void dfu_timeout_handler(struct k_work *work)
 	}
 }
 
-static bool smp_cmd_is_suit_dfu_cmd(const struct mgmt_evt_op_cmd_arg *cmd,
-				    const char **smp_cmd_name)
-{
-#if CONFIG_MGMT_SUITFU_GRP_SUIT
-	if (cmd->group == CONFIG_MGMT_GROUP_ID_SUIT) {
-		*smp_cmd_name = "SUIT Management";
-		return true;
-	}
-#endif /* CONFIG_MGMT_SUITFU_GRP_SUIT */
-
-	return false;
-}
-
 static bool smp_cmd_is_dfu_cmd(const struct mgmt_evt_op_cmd_arg *cmd)
 {
 	const char *smp_cmd_name = "Unknown";
@@ -101,10 +74,6 @@ static bool smp_cmd_is_dfu_cmd(const struct mgmt_evt_op_cmd_arg *cmd)
 		dfu_transfer_cmd = false;
 	}
 
-	if (IS_ENABLED(CONFIG_DESKTOP_DFU_BACKEND_SUIT) && !dfu_transfer_cmd) {
-		dfu_transfer_cmd = smp_cmd_is_suit_dfu_cmd(cmd, &smp_cmd_name);
-	}
-
 	if (dfu_transfer_cmd && smp_cmd_name) {
 		LOG_DBG("MCUmgr %s event", smp_cmd_name);
 	}
@@ -161,7 +130,6 @@ static struct mgmt_callback cmd_recv_cb = {
 	.event_id = MGMT_EVT_OP_CMD_RECV,
 };
 
-#if CONFIG_DESKTOP_DFU_BACKEND_MCUBOOT
 static void dfu_backend_init(void)
 {
 	if (!IS_ENABLED(CONFIG_DESKTOP_DFU_MCUMGR_MCUBOOT_DIRECT_XIP)) {
@@ -172,76 +140,12 @@ static void dfu_backend_init(void)
 		}
 	}
 
-	LOG_INF("MCUboot image version: %s", CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION);
-}
-#elif CONFIG_DESKTOP_DFU_BACKEND_SUIT
-static const char *suit_release_type_str_get(suit_version_release_type_t type)
-{
-	switch (type) {
-	case SUIT_VERSION_RELEASE_NORMAL:
-		return NULL;
-	case SUIT_VERSION_RELEASE_RC:
-		return "rc";
-	case SUIT_VERSION_RELEASE_BETA:
-		return "beta";
-	case SUIT_VERSION_RELEASE_ALPHA:
-		return "alpha";
-	default:
-		__ASSERT(0, "Unknown release type");
-		return NULL;
-	}
-};
-
-static void dfu_backend_init(void)
-{
-	int err;
-	bool is_semver_supported;
-	unsigned int seq_num = 0;
-	suit_ssf_manifest_class_info_t class_info;
-	suit_semver_raw_t version_raw;
-	suit_version_t version;
-
-	err = suit_get_supported_manifest_info(SUIT_MANIFEST_APP_ROOT, &class_info);
-	if (!err) {
-		err = suit_get_installed_manifest_info(&(class_info.class_id),
-				&seq_num, &version_raw, NULL, NULL, NULL);
-	}
-	if (!err) {
-		/* Semantic versioning support has been added to the SDFW in the v0.6.2
-		 * public release. Older SDFW versions return empty array in the version
-		 * variable.
-		 */
-		is_semver_supported = (version_raw.len != 0);
-		if (is_semver_supported) {
-			err = suit_metadata_version_from_array(&version,
-							       version_raw.raw,
-							       version_raw.len);
-		}
-	}
+	k_work_init_delayable(&dfu_timeout, dfu_timeout_handler);
 
-	if (!err) {
-		if (is_semver_supported) {
-			const char *release_type;
-
-			release_type = suit_release_type_str_get(version.type);
-			if (release_type) {
-				LOG_INF("SUIT manifest version: %d.%d.%d-%s%d",
-					version.major, version.minor, version.patch,
-					release_type, version.pre_release_number);
-			} else {
-				LOG_INF("SUIT manifest version: %d.%d.%d",
-					version.major, version.minor, version.patch);
-			}
-		}
+	mgmt_callback_register(&cmd_recv_cb);
 
-		LOG_INF("SUIT manifest sequence number: %d", seq_num);
-	} else {
-		LOG_ERR("SUIT manifest info retrieval failed (err: %d)", err);
-	}
+	LOG_INF("MCUboot image version: %s", CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION);
 }
-#else
-#error "The DFU backend choice is not supported"
-#endif /* CONFIG_DESKTOP_DFU_BACKEND_MCUBOOT */
 
 static bool app_event_handler(const struct app_event_header *aeh)
 {
@@ -261,11 +165,8 @@ static bool app_event_handler(const struct app_event_header *aeh)
 
 		if (check_state(event, MODULE_ID(main), MODULE_STATE_READY)) {
 			dfu_backend_init();
-
-			k_work_init_delayable(&dfu_timeout, dfu_timeout_handler);
-
-			mgmt_callback_register(&cmd_recv_cb);
 		}
+
 		return false;
 	}