nrf_desktop: Fix checks for the current DFU slot

Do not use the DT_FIXED_PARTITION_ADDR for now and allow to start the FW
core in the middle of the MCUboot slot.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

applications/nrf_desktop/src/modules/dfu.c

@@ -107,9 +107,19 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
 		BUILD_ASSERT(DT_FIXED_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE),
 			     "Missing secondary partition definition in DTS.");
 
-		#define CODE_PARTITION_START_ADDR    DT_FIXED_PARTITION_ADDR(CODE_PARTITION_NODE)
-		#define MCUBOOT_PRIMARY_START_ADDR   DT_FIXED_PARTITION_ADDR(MCUBOOT_PRIMARY_NODE)
-		#define MCUBOOT_SECONDARY_START_ADDR DT_FIXED_PARTITION_ADDR(MCUBOOT_SECONDARY_NODE)
+
+		/* DT_FIXED_PARTITION_ADDR is not supported on nRF54H20.
+		 * See: https://github.com/zephyrproject-rtos/zephyr/pull/96808
+		 */
+		#define PARTITION_ADDR_FIXED(node)   (DT_REG_ADDR(node_id) + \
+						      DT_REG_ADDR(DT_GPARENT(node_id)))
+		#define CODE_PARTITION_START_ADDR    PARTITION_ADDR_FIXED(CODE_PARTITION_NODE)
+		#define MCUBOOT_PRIMARY_START_ADDR   PARTITION_ADDR_FIXED(MCUBOOT_PRIMARY_NODE)
+		#define MCUBOOT_SECONDARY_START_ADDR PARTITION_ADDR_FIXED(MCUBOOT_SECONDARY_NODE)
+		#define MCUBOOT_PRIMARY_END_ADDR     (MCUBOOT_PRIMARY_START_ADDR + \
+						      DT_REG_SIZE(MCUBOOT_PRIMARY_NODE0))
+		#define MCUBOOT_SECOARY_END_ADDR     (MCUBOOT_SECONDARY_START_ADDR + \
+						      DT_REG_SIZE(MCUBOOT_SECONDARY_NODE0))
 
 		#if MCUBOOT_PRIMARY_START_ADDR == MCUBOOT_SECONDARY_START_ADDR
 			#error Primary and secondary partitions cannot have the same address.
@@ -118,9 +128,11 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
 		#define MCUBOOT_PRIMARY_SLOT_ID   DT_FIXED_PARTITION_ID(MCUBOOT_PRIMARY_NODE)
 		#define MCUBOOT_SECONDARY_SLOT_ID DT_FIXED_PARTITION_ID(MCUBOOT_SECONDARY_NODE)
 
-		#if CODE_PARTITION_START_ADDR == MCUBOOT_PRIMARY_START_ADDR
+		#if (CODE_PARTITION_START_ADDR >= MCUBOOT_PRIMARY_START_ADDR) &&
+		    (CODE_PARTITION_START_ADDR < MCUBOOT_PRIMARY_END_ADDR)
 			#define DFU_SLOT_ID MCUBOOT_SECONDARY_SLOT_ID
-		#elif CODE_PARTITION_START_ADDR == MCUBOOT_SECONDARY_START_ADDR
+		#elif (CODE_PARTITION_START_ADDR >= MCUBOOT_SECONDARY_START_ADDR) &&
+		      (CODE_PARTITION_START_ADDR < MCUBOOT_SECONDARY_END_ADDR)
 			#define DFU_SLOT_ID MCUBOOT_PRIMARY_SLOT_ID
 		#else
 			#error Missing partition definitions in DTS.