Skip to content

[nrf fromtree] Add support for subpartitions in flash_map #3350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2025
+68 −22
Merged

[nrf fromtree] Add support for subpartitions in flash_map #3350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcad696
[nrf fromtree] devicetree: Fix MTD macro for subpartitions
tomchy Oct 1, 2025
c33bb47
[nrf fromtree] devicetree: Fix ADDRESS macro for non-nv-flash
tomchy Oct 2, 2025
92f020d
[nrf fromtree] storage: Allow to use subpartitions in flash_map
tomchy Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/zephyr/devicetree/fixed-partitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
* node containing it.
*/
#define DT_FIXED_PARTITION_ADDR(node_id) \
(DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(node_id)) + DT_REG_ADDR(node_id))
(DT_REG_ADDR(node_id) + DT_REG_ADDR(DT_GPARENT(node_id)))

Check notice on line 135 in include/zephyr/devicetree/fixed-partitions.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/devicetree/fixed-partitions.h:135 
-#define DT_FIXED_PARTITION_ADDR(node_id)                                                           \
-	(DT_REG_ADDR(node_id) + DT_REG_ADDR(DT_GPARENT(node_id)))
+#define DT_FIXED_PARTITION_ADDR(node_id) (DT_REG_ADDR(node_id) + DT_REG_ADDR(DT_GPARENT(node_id)))
/**
* @brief Test if fixed-subpartitions compatible node exists
*
Expand Down Expand Up @@ -160,7 +160,7 @@
*/
#define DT_MTD_FROM_FIXED_SUBPARTITION(node_id) \
COND_CODE_1(DT_NODE_EXISTS(DT_MEM_FROM_FIXED_SUBPARTITION(node_id)), \
(DT_PARENT(DT_MEM_FROM_FIXED_SUBPARTITION(node_id))), (DT_GPARENT(node_id)))
(DT_PARENT(DT_MEM_FROM_FIXED_SUBPARTITION(node_id))), (DT_GPARENT(DT_PARENT(node_id))))

/**
* @brief Get the absolute address of a fixed subpartition
Expand Down Expand Up @@ -207,7 +207,7 @@
* node containing it.
*/
#define DT_FIXED_SUBPARTITION_ADDR(node_id) \
(DT_REG_ADDR(DT_MEM_FROM_FIXED_SUBPARTITION(node_id)) + DT_REG_ADDR(node_id))
(DT_REG_ADDR(node_id) + DT_REG_ADDR(DT_GPARENT(DT_PARENT(node_id))))

/**
* @}
Expand Down
60 changes: 54 additions & 6 deletions include/zephyr/storage/flash_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,17 @@
#else

/**
* Returns non-0 value if fixed-partition of given DTS node label exists.
* Returns non-0 value if fixed-partition or fixed-subpartition of given
* DTS node label exists.
*
* @param label DTS node label
*
* @return non-0 if fixed-partition node exists and is enabled;
* 0 if node does not exist, is not enabled or is not fixed-partition.
*/
#define FIXED_PARTITION_EXISTS(label) DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(label))
#define FIXED_PARTITION_EXISTS(label) \
UTIL_OR(DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(label)), \
DT_FIXED_SUBPARTITION_EXISTS(DT_NODELABEL(label)))

Check notice on line 366 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:366 
-#define FIXED_PARTITION_EXISTS(label) \
-	UTIL_OR(DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(label)), \
+#define FIXED_PARTITION_EXISTS(label)                                                              \
+	UTIL_OR(DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(label)),                                    \

/**
* Get flash area ID from fixed-partition DTS node label
Expand All @@ -372,14 +375,38 @@
#define FIXED_PARTITION_ID(label) DT_FIXED_PARTITION_ID(DT_NODELABEL(label))

/**
* Get fixed-partition offset from DTS node label
* Get fixed-partition or fixed-subpartition offset from DTS node label
*
* @param label DTS node label of a partition
*
* @return fixed-partition offset, as defined for the partition in DTS.
*/
#define FIXED_PARTITION_OFFSET(label) DT_REG_ADDR(DT_NODELABEL(label))

/**
* Get fixed-partition or fixed-subpartition address from DTS node label
*
* @param label DTS node label of a partition or subpartition
*
* @return fixed-partition address, as defined for the partition in DTS.
*/
#define FIXED_PARTITION_ADDRESS(label) \
(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(DT_NODELABEL(label)), \

Check notice on line 394 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:394 
-#define FIXED_PARTITION_ADDRESS(label) \
+#define FIXED_PARTITION_ADDRESS(label)                                                             \
(DT_FIXED_SUBPARTITION_ADDR(DT_NODELABEL(label))), \
(DT_FIXED_PARTITION_ADDR(DT_NODELABEL(label)))))

/**
* Get fixed-partition or fixed-subpartition address from DTS node
*
* @param node DTS node of a partition
*
* @return fixed-partition address, as defined for the partition in DTS.
*/
#define FIXED_PARTITION_NODE_ADDRESS(node) \
(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(node), \

Check notice on line 406 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:406 
-#define FIXED_PARTITION_NODE_ADDRESS(node) \
+#define FIXED_PARTITION_NODE_ADDRESS(node)                                                         \
(DT_FIXED_SUBPARTITION_ADDR(node)), \
(DT_FIXED_PARTITION_ADDR(node))))

/**
* Get fixed-partition offset from DTS node
*
Expand Down Expand Up @@ -425,8 +452,10 @@
* @return Pointer to a device.
*/
#define FIXED_PARTITION_DEVICE(label) \
DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(DT_NODELABEL(label)))

DEVICE_DT_GET(COND_CODE_1( \

Check notice on line 455 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:455 
-#define FIXED_PARTITION_DEVICE(label) \
+#define FIXED_PARTITION_DEVICE(label)                                                              \
DT_FIXED_SUBPARTITION_EXISTS(DT_NODELABEL(label)), \
(DT_MTD_FROM_FIXED_SUBPARTITION(DT_NODELABEL(label))), \
(DT_MTD_FROM_FIXED_PARTITION(DT_NODELABEL(label)))))
/**
* Get device pointer for device the area/partition resides on
*
Expand All @@ -435,7 +464,10 @@
* @return Pointer to a device.
*/
#define FIXED_PARTITION_NODE_DEVICE(node) \
DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(node))
DEVICE_DT_GET(COND_CODE_1( \

Check notice on line 467 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:467 
-#define FIXED_PARTITION_NODE_DEVICE(node) \
+#define FIXED_PARTITION_NODE_DEVICE(node)                                                          \
DT_FIXED_SUBPARTITION_EXISTS(node), \
(DT_MTD_FROM_FIXED_SUBPARTITION(node)), \
(DT_MTD_FROM_FIXED_PARTITION(node))))

/**
* Get pointer to flash_area object by partition label
Expand Down Expand Up @@ -471,6 +503,22 @@
#undef DECLARE_PARTITION
#undef DECLARE_PARTITION_0
#undef FOR_EACH_PARTITION_TABLE

#define FIXED_SUBPARTITION_1(node) FIXED_SUBPARTITION_0(DT_DEP_ORD(node))
#define FIXED_SUBPARTITION_0(ord) \
((const struct flash_area *)&DT_CAT(global_fixed_subpartition_ORD_, ord))

#define DECLARE_SUBPARTITION(node) DECLARE_SUBPARTITION_0(DT_DEP_ORD(node))
#define DECLARE_SUBPARTITION_0(ord) \
extern const struct flash_area DT_CAT(global_fixed_subpartition_ORD_, ord);

Check notice on line 513 in include/zephyr/storage/flash_map.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/storage/flash_map.h:513 
-#define FIXED_SUBPARTITION_0(ord)						\
+#define FIXED_SUBPARTITION_0(ord)                                                                  \
 	((const struct flash_area *)&DT_CAT(global_fixed_subpartition_ORD_, ord))
 
 #define DECLARE_SUBPARTITION(node) DECLARE_SUBPARTITION_0(DT_DEP_ORD(node))
-#define DECLARE_SUBPARTITION_0(ord)						\
+#define DECLARE_SUBPARTITION_0(ord)                                                                \
#define FOR_EACH_SUBPARTITION_TABLE(table) DT_FOREACH_CHILD(table, DECLARE_SUBPARTITION)

/* Generate declarations */
DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOR_EACH_SUBPARTITION_TABLE)

#undef DECLARE_SUBPARTITION
#undef DECLARE_SUBPARTITION_0
#undef FOR_EACH_SUBPARTITION_TABLE
/** @endcond */

#endif /* USE_PARTITION_MANAGER */
Expand Down
13 changes: 7 additions & 6 deletions subsys/storage/flash_map/flash_map_default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@
*/
const struct flash_area default_flash_map[] = {
DT_FOREACH_STATUS_OKAY(fixed_partitions, FOREACH_PARTITION)
DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOREACH_PARTITION)
};

Check notice on line 45 in subsys/storage/flash_map/flash_map_default.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/storage/flash_map/flash_map_default.c:45 
-	DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOREACH_PARTITION)
-};
+		DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOREACH_PARTITION)};
const int flash_map_entries = ARRAY_SIZE(default_flash_map);
const struct flash_area *flash_map = default_flash_map;

Expand All @@ -63,17 +64,17 @@
#define FOR_EACH_PARTITION_TABLE(table) DT_FOREACH_CHILD(table, DEFINE_PARTITION)
DT_FOREACH_STATUS_OKAY(fixed_partitions, FOR_EACH_PARTITION_TABLE)

#define DEFINE_SUB_PARTITION(part) DEFINE_SUB_PARTITION_1(part, DT_DEP_ORD(part))
#define DEFINE_SUB_PARTITION_1(part, ord) \
#define DEFINE_SUBPARTITION(part) DEFINE_SUBPARTITION_1(part, DT_DEP_ORD(part))
#define DEFINE_SUBPARTITION_1(part, ord) \
COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_SUBPARTITION(part)), \
(DEFINE_SUB_PARTITION_0(part, ord)), ())
#define DEFINE_SUB_PARTITION_0(part, ord) \
(DEFINE_SUBPARTITION_0(part, ord)), ())
#define DEFINE_SUBPARTITION_0(part, ord) \
const struct flash_area DT_CAT(global_fixed_subpartition_ORD_, ord) = { \
.fa_id = DT_FIXED_PARTITION_ID(part), \
.fa_off = DT_REG_ADDR(part), \
.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_SUBPARTITION(part)), \
.fa_size = DT_REG_SIZE(part), \
};

Check notice on line 77 in subsys/storage/flash_map/flash_map_default.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/storage/flash_map/flash_map_default.c:77 
-#define DEFINE_SUBPARTITION_1(part, ord)							\
+#define DEFINE_SUBPARTITION_1(part, ord)                                                           \
 	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_SUBPARTITION(part)),		\
 		(DEFINE_SUBPARTITION_0(part, ord)), ())
-#define DEFINE_SUBPARTITION_0(part, ord)							\
-	const struct flash_area DT_CAT(global_fixed_subpartition_ORD_, ord) = {			\
-		.fa_id = DT_FIXED_PARTITION_ID(part),						\
-		.fa_off = DT_REG_ADDR(part),							\
-		.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_SUBPARTITION(part)),			\
-		.fa_size = DT_REG_SIZE(part),							\
+#define DEFINE_SUBPARTITION_0(part, ord)                                                           \
+	const struct flash_area DT_CAT(global_fixed_subpartition_ORD_, ord) = {                    \
+		.fa_id = DT_FIXED_PARTITION_ID(part),                                              \
+		.fa_off = DT_REG_ADDR(part),                                                       \
+		.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_SUBPARTITION(part)),                     \
+		.fa_size = DT_REG_SIZE(part),                                                      \

#define FOR_EACH_SUB_PARTITION_TABLE(table) DT_FOREACH_CHILD(table, DEFINE_SUB_PARTITION)
DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOR_EACH_SUB_PARTITION_TABLE)
#define FOR_EACH_SUBPARTITION_TABLE(table) DT_FOREACH_CHILD(table, DEFINE_SUBPARTITION)
DT_FOREACH_STATUS_OKAY(fixed_subpartitions, FOR_EACH_SUBPARTITION_TABLE)
11 changes: 4 additions & 7 deletions tests/lib/devicetree/api/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3271,13 +3271,7 @@
/* Test DT_FIXED_PARTITION_ADDR. */
zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_0), 0x20000000);
zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_1), 0x200000c0);

/* DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2) expands to an invalid expression.
* Test this by way of string comparison.
*/
zassert_true(!strcmp(TO_STRING(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2)),
"(__REG_IDX_0_VAL_ADDRESSU + 458624U)"));
zassert_equal(DT_REG_ADDR(TEST_PARTITION_2), 458624);
zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2), 0x33291080);

/* Test that all DT_FIXED_PARTITION_ID are defined and unique. */
#define FIXED_PARTITION_ID_COMMA(node_id) DT_FIXED_PARTITION_ID(node_id),
Expand Down Expand Up @@ -3312,7 +3306,10 @@
zassert_true(DT_NODE_EXISTS(DT_MTD_FROM_FIXED_PARTITION(TEST_SUBPARTITION_COMBINED)));
zassert_true(DT_NODE_EXISTS(DT_MTD_FROM_FIXED_SUBPARTITION(TEST_SUBPARTITION_0)));
zassert_true(DT_NODE_EXISTS(DT_MTD_FROM_FIXED_SUBPARTITION(TEST_SUBPARTITION_1)));
zassert_true(DT_SAME_NODE(
DT_MTD_FROM_FIXED_PARTITION(TEST_SUBPARTITION_COMBINED),
DT_MTD_FROM_FIXED_SUBPARTITION(TEST_SUBPARTITION_1)));

Check notice on line 3312 in tests/lib/devicetree/api/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/lib/devicetree/api/src/main.c:3312 
-	zassert_true(DT_SAME_NODE(
-		DT_MTD_FROM_FIXED_PARTITION(TEST_SUBPARTITION_COMBINED),
-		DT_MTD_FROM_FIXED_SUBPARTITION(TEST_SUBPARTITION_1)));
+	zassert_true(DT_SAME_NODE(DT_MTD_FROM_FIXED_PARTITION(TEST_SUBPARTITION_COMBINED),
+				  DT_MTD_FROM_FIXED_SUBPARTITION(TEST_SUBPARTITION_1)));
/* Test DT_FIXED_SUBPARTITION_ADDR. */
zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_SUBPARTITION_COMBINED), 0x20000100);
zassert_equal(DT_FIXED_SUBPARTITION_ADDR(TEST_SUBPARTITION_0),
Expand Down
Loading