dfu: dfu_target: New DFU target SMP #11992

jheiskan81 · 2023-08-09T12:39:37Z

Added new DFU target for update image to external MCU by using MCUMGR SMP client.

NordicBuilder · 2023-08-09T12:42:41Z

Test specification

CI/Jenkins/NRF

Integration Platforms

CI/Jenkins/integration

Test Module	File based changes	Manually selected	West overwrite
test-ci-nrfconnect-boot-fw-update	X
test-fw-nrfconnect-chip	X
test-fw-nrfconnect-nrf-iot_serial_lte_modem	X
test-fw-nrfconnect-zigbee	X
test-sdk-find-my	X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

NordicBuilder · 2023-08-09T13:51:04Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

jheiskan81 · 2023-08-10T07:47:06Z

@rlubos Please review. Looks like that AVSystem have some issue that LwM2M authentication & flash Test fail randomly. Looks like that Boostrastrap is allways passed but real DTLS connection timeout when it fail.

rlubos · 2023-08-10T09:22:50Z

@rlubos Please review. Looks like that AVSystem have some issue that LwM2M authentication & flash Test fail randomly. Looks like that Boostrastrap is allways passed but real DTLS connection timeout when it fail.

Is this comment related to this particular PR? I don't see how Bootstrap/DTLS is releated to changes in dfu_target?

jheiskan81 · 2023-08-10T09:25:24Z

@rlubos Please review. Looks like that AVSystem have some issue that LwM2M authentication & flash Test fail randomly. Looks like that Boostrastrap is allways passed but real DTLS connection timeout when it fail.

Is this comment related to this particular PR? I don't see how Bootstrap/DTLS is releated to changes in dfu_target?

CI test was failing and I was looking for that.. DFU target uppdate is not affect that.

include/dfu/dfu_target_smp.h

nordicjm · 2023-08-10T09:56:20Z

subsys/dfu/dfu_target/src/dfu_target_smp.c

+	}
+
+	if (dfu_target_reset_cb) {
+		upload_state.image_num = 2;


This is also a bit flimsy, works OK for nrf52840dk in normal state but if someone decides to change MCUboot on that core to be e.g. direct XIP, they would want the opposite slot. Probably OK for initial commit but should have a jira created

subsys/dfu/dfu_target/src/dfu_target_smp.c

jheiskan81 · 2023-08-11T11:24:59Z

@nordicjm thanks for comment's I have been fix those now. Reset do now erase and reset_command it do device reset which apply image update and exit from recovery mode.

nordicjm

Some minor nits.

subsys/dfu/dfu_target/Kconfig

subsys/dfu/dfu_target/src/dfu_target_smp.c

jheiskan81 · 2023-08-15T07:46:47Z

@nordicjm Thanks for comment's. I was removing erase from schedule update fail and fix your spotted issues.

jheiskan81 · 2023-08-17T07:39:00Z

@rlubos @nordicjm Please review. I have already stuff ready for next PR. I can update Change log If review is ready.

include/dfu/dfu_target_smp.h

subsys/dfu/dfu_target/src/dfu_target_smp.c

jheiskan81 · 2023-08-17T11:38:35Z

Updated Change-log information about new DFU target

jheiskan81 · 2023-08-18T06:47:27Z

@annakielar @carlescufi @rlubos Please review.

annakielar · 2023-08-18T10:10:15Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

-|no_changes_yet_note|
+* Added:
+
+  * New DFU SMP target for update image to external MCU by using MCUMGR SMP client.


Suggested change

* New DFU SMP target for update image to external MCU by using MCUMGR SMP client.

* A new DFU SMP target for update image to external MCU by using the MCUmgr SMP Client.

annakielar · 2023-08-18T10:13:25Z

include/dfu/dfu_target_smp.h

+ *
+ * @defgroup dfu_target_SMP SMP external MCU target
+ * @{
+ * @brief DFU Target for upgrades performed by SMP Client


Suggested change

* @brief DFU Target for upgrades performed by SMP Client

* @brief DFU Target for upgrades performed by SMP Client.

annakielar · 2023-08-18T10:15:04Z

include/dfu/dfu_target_smp.h

+ * Function that boots the target in MCUboot serial recovery mode, needed before sending
+ * SMP commands.
+ *
+ * @param[in] cb User defined target reset function for entering recovery mode


Suggested change

* @param[in] cb User defined target reset function for entering recovery mode

* @param[in] cb User-defined target reset function for entering recovery mode.

Please add missing full stops at the end of all full sentences in this file.

annakielar · 2023-08-18T10:15:58Z

include/dfu/dfu_target_smp.h

+/**
+ * @brief Initialize dfu target SMP client
+ *
+ * @retval 0 If successful, negative errno otherwise.


Suggested change

* @retval 0 If successful, negative errno otherwise.

* @retval 0 on success, negative errno otherwise.

annakielar · 2023-08-18T10:16:12Z

include/dfu/dfu_target_smp.h

+int dfu_target_smp_image_list_get(struct mcumgr_image_state *res_buf);
+
+/**
+ * @brief Reboot SMP target device and apply new image.


Suggested change

* @brief Reboot SMP target device and apply new image.

* @brief Reboot SMP target device, and apply new image.

annakielar · 2023-08-18T10:18:07Z

include/dfu/dfu_target_smp.h

+int dfu_target_smp_client_init(void);
+
+/**
+ * @brief Read Image list


Suggested change

* @brief Read Image list

* @brief Read image list.

annakielar · 2023-08-18T10:18:18Z

include/dfu/dfu_target_smp.h

+/**
+ * @brief Read Image list
+ *
+ * @param res_buf Image List buffer


Suggested change

* @param res_buf Image List buffer

* @param res_buf Image list buffer.

annakielar · 2023-08-18T10:32:36Z

include/dfu/dfu_target_smp.h

+int dfu_target_smp_confirm_image(void);
+
+/**
+ * @brief See if data in buf indicates MCUBoot style upgrade.


Suggested change

* @brief See if data in buf indicates MCUBoot style upgrade.

* @brief Check if data in buffer indicates MCUboot style upgrade.

Do you mean buffer or, e.g., buf parameter?

include/dfu/dfu_target_smp.h

jheiskan81 · 2023-08-18T11:32:47Z

@annakielar Thanks for review. I have fixed your proposed changes.

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Added new DFU SMP target for update image to external MCU by using MCUMGR SMP client. Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>

jheiskan81 requested review from hakonfam, sigvartmh, anangl and rlubos as code owners August 9, 2023 12:39

github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Aug 9, 2023

jheiskan81 force-pushed the dfu_smp_target branch 2 times, most recently from 4797ce9 to c0f8226 Compare August 9, 2023 12:54

jheiskan81 force-pushed the dfu_smp_target branch from c0f8226 to 55f26c5 Compare August 10, 2023 06:44

rlubos requested review from nordicjm and de-nordic August 10, 2023 09:21

nordicjm reviewed Aug 10, 2023

View reviewed changes

jheiskan81 force-pushed the dfu_smp_target branch 2 times, most recently from dca4dba to 6ea8b4e Compare August 11, 2023 11:23

jheiskan81 force-pushed the dfu_smp_target branch from 6ea8b4e to eab8dd8 Compare August 14, 2023 09:32

nordicjm reviewed Aug 14, 2023

View reviewed changes

jheiskan81 force-pushed the dfu_smp_target branch from eab8dd8 to 1489779 Compare August 15, 2023 07:43

nordicjm reviewed Aug 17, 2023

View reviewed changes

include/dfu/dfu_target_smp.h Outdated Show resolved Hide resolved

subsys/dfu/dfu_target/src/dfu_target_smp.c Outdated Show resolved Hide resolved

jheiskan81 force-pushed the dfu_smp_target branch from 1489779 to 2d6356a Compare August 17, 2023 09:29

nordicjm approved these changes Aug 17, 2023

View reviewed changes

jheiskan81 force-pushed the dfu_smp_target branch from 2d6356a to d4351c6 Compare August 17, 2023 11:37

jheiskan81 requested a review from carlescufi as a code owner August 17, 2023 11:37

github-actions bot added the doc-required PR must not be merged without tech writer approval. label Aug 17, 2023

github-actions bot removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Aug 17, 2023

nordicjm requested a review from annakielar August 17, 2023 12:01

SeppoTakalo approved these changes Aug 18, 2023

View reviewed changes

jheiskan81 mentioned this pull request Aug 18, 2023

Integrate DFU target SMP #12073

Merged

de-nordic approved these changes Aug 18, 2023

View reviewed changes

annakielar suggested changes Aug 18, 2023

View reviewed changes

jheiskan81 force-pushed the dfu_smp_target branch from d4351c6 to 436bb95 Compare August 18, 2023 11:29

annakielar approved these changes Aug 18, 2023

View reviewed changes

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst Outdated Show resolved Hide resolved

jheiskan81 force-pushed the dfu_smp_target branch from 436bb95 to a41a07c Compare August 18, 2023 11:57

dfu: dfu_target: New DFU target SMP

9611516

Added new DFU SMP target for update image to external MCU by using MCUMGR SMP client. Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>

jheiskan81 force-pushed the dfu_smp_target branch from a41a07c to 9611516 Compare August 18, 2023 12:00

rlubos merged commit 7b698f8 into nrfconnect:main Aug 21, 2023
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dfu: dfu_target: New DFU target SMP #11992

dfu: dfu_target: New DFU target SMP #11992

jheiskan81 commented Aug 9, 2023

NordicBuilder commented Aug 9, 2023 •

edited

Loading

NordicBuilder commented Aug 9, 2023

jheiskan81 commented Aug 10, 2023 •

edited

Loading

rlubos commented Aug 10, 2023

jheiskan81 commented Aug 10, 2023

nordicjm Aug 10, 2023

jheiskan81 commented Aug 11, 2023

nordicjm left a comment

jheiskan81 commented Aug 15, 2023

jheiskan81 commented Aug 17, 2023

jheiskan81 commented Aug 17, 2023

jheiskan81 commented Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

annakielar Aug 18, 2023

jheiskan81 commented Aug 18, 2023

	* New DFU SMP target for update image to external MCU by using MCUMGR SMP client.
	* A new DFU SMP target for update image to external MCU by using the MCUmgr SMP Client.

	* @brief DFU Target for upgrades performed by SMP Client
	* @brief DFU Target for upgrades performed by SMP Client.

	* @param[in] cb User defined target reset function for entering recovery mode
	* @param[in] cb User-defined target reset function for entering recovery mode.

	* @retval 0 If successful, negative errno otherwise.
	* @retval 0 on success, negative errno otherwise.

	* @brief Reboot SMP target device and apply new image.
	* @brief Reboot SMP target device, and apply new image.

	* @param res_buf Image List buffer
	* @param res_buf Image list buffer.

	* @brief See if data in buf indicates MCUBoot style upgrade.
	* @brief Check if data in buffer indicates MCUboot style upgrade.

dfu: dfu_target: New DFU target SMP #11992

dfu: dfu_target: New DFU target SMP #11992

Conversation

jheiskan81 commented Aug 9, 2023

NordicBuilder commented Aug 9, 2023 • edited Loading

Test specification

NordicBuilder commented Aug 9, 2023

jheiskan81 commented Aug 10, 2023 • edited Loading

rlubos commented Aug 10, 2023

jheiskan81 commented Aug 10, 2023

Choose a reason for hiding this comment

jheiskan81 commented Aug 11, 2023

nordicjm left a comment

Choose a reason for hiding this comment

jheiskan81 commented Aug 15, 2023

jheiskan81 commented Aug 17, 2023

jheiskan81 commented Aug 17, 2023

jheiskan81 commented Aug 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jheiskan81 commented Aug 18, 2023

NordicBuilder commented Aug 9, 2023 •

edited

Loading

jheiskan81 commented Aug 10, 2023 •

edited

Loading