susbys/dfu/img_util: support ERASE PROGRESSIVELY for non-flash mem #79152

nvlsianpu · 2024-09-28T19:16:58Z

Added support for devices don't require explicit pager erase. For these device flattening of mcuboot image status is relevant.

…on-flash mem Added support for devices don't require explicit pager erase. For these device flattening of mcuboot image status is relevant. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

subsys/dfu/img_util/flash_img.c

…on-flash mem Added support for devices don't require explicit pager erase. For these device flattening of mcuboot image status is relevant. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

…mentation Moved MCUboot trailer's status erase ahead any write operation. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

de-nordic · 2024-10-08T12:52:06Z

subsys/dfu/img_util/flash_img.c

+			 */
+			offset = (toff + fparams->write_block_size - 1) &
+				 ~(fparams->write_block_size - 1);
+			/* No alignment correction neede here, offset is corrected already */


'and size should be aligned'

de-nordic · 2024-10-08T12:58:15Z

Please squash both commits together.

…mentation Moved MCUboot trailer's status erase ahead any write operation, which is step which helps with addition of support for devices don't require explicit pager erase. For these kind of devices flattening of mcuboot image status in the trailer was introduced. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

nordicjm · 2024-10-10T09:00:01Z

subsys/dfu/img_util/flash_img.c

+		} else
+#endif
+		{
+


stray newline

nordicjm · 2024-10-10T09:01:53Z

subsys/dfu/img_util/flash_img.c

+			 */
+			offset = (toff + fparams->write_block_size - 1) &
+				 ~(fparams->write_block_size - 1);
+			/* No alignment correction neede here, offset is corrected already


Suggested change

/* No alignment correction neede here, offset is corrected already

/* No alignment correction needed here, offset is corrected already

nordicjm · 2024-10-10T09:02:41Z

subsys/dfu/img_util/flash_img.c

 int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
 			     size_t len, bool flush)
 {
 	int rc;

-	rc = stream_flash_buffered_write(&ctx->stream, data, len, flush);
-	if (!flush) {
+	/* If there is need to erase trailer, that should happen before any


Suggested change

/* If there is need to erase trailer, that should happen before any

/* If there is a need to erase the trailer, that should happen before any

…mentation Moved MCUboot trailer's status erase ahead any write operation, which is step which helps with addition of support for devices don't require explicit pager erase. For these kind of devices flattening of mcuboot image status in the trailer was introduced. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

Moved MCUboot trailer's status erase ahead any write operation, which is step which helps with addition of support for devices don't require explicit pager erase. For these kind of devices flattening of mcuboot image status in the trailer was introduced. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

…mentation Moved MCUboot trailer's status erase ahead any write operation, which is step which helps with addition of support for devices don't require explicit pager erase. For these kind of devices flattening of mcuboot image status in the trailer was introduced. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

…on-flash mem Added support for devices don't require explicit pager erase. For these device flattening of mcuboot image status is relevant. Upstream PR: zephyrproject-rtos/zephyr#79152 Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> (cherry picked from commit 30f066a)

zephyrbot added the area: DFU Device Firmware Upgrade label Sep 28, 2024

zephyrbot requested review from de-nordic and nordicjm September 28, 2024 19:17

zephyrbot assigned de-nordic and nordicjm Sep 28, 2024

de-nordic previously approved these changes Sep 28, 2024

View reviewed changes

de-nordic added this to the v4.0.0 milestone Sep 28, 2024

nvlsianpu commented Sep 29, 2024

View reviewed changes

subsys/dfu/img_util/flash_img.c Outdated Show resolved Hide resolved

de-nordic added the DNM This PR should not be merged (Do Not Merge) label Oct 4, 2024

nvlsianpu dismissed de-nordic’s stale review via f21eb74 October 7, 2024 15:49

nvlsianpu force-pushed the u_flash_img_flatten branch from f21eb74 to 8314f7f Compare October 7, 2024 20:29

nvlsianpu mentioned this pull request Oct 7, 2024

[nrf fromlist] susbys/dfu/img_util: refined ERASE PROGRESSIVELY imple… nrfconnect/sdk-zephyr#2073

Merged

de-nordic reviewed Oct 8, 2024

View reviewed changes

nvlsianpu force-pushed the u_flash_img_flatten branch from 8314f7f to cb4cd12 Compare October 8, 2024 17:10

nvlsianpu force-pushed the u_flash_img_flatten branch from cb4cd12 to 1c63254 Compare October 8, 2024 17:44

de-nordic previously approved these changes Oct 9, 2024

View reviewed changes

nordicjm reviewed Oct 10, 2024

View reviewed changes

subsys/dfu/img_util/flash_img.c Outdated

} else

#endif

{

Copy link

Collaborator

nordicjm Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stray newline

nordicjm reviewed Oct 10, 2024

View reviewed changes

nvlsianpu dismissed de-nordic’s stale review via 95198b1 October 17, 2024 07:40

nvlsianpu force-pushed the u_flash_img_flatten branch from 1c63254 to 95198b1 Compare October 17, 2024 07:40

nvlsianpu force-pushed the u_flash_img_flatten branch from 95198b1 to 32eab50 Compare October 17, 2024 08:12

nvlsianpu removed the DNM This PR should not be merged (Do Not Merge) label Oct 17, 2024

nordicjm approved these changes Oct 18, 2024

View reviewed changes

nordicjm requested a review from de-nordic October 18, 2024 07:43

de-nordic approved these changes Oct 18, 2024

View reviewed changes

nashif merged commit 17c15e3 into zephyrproject-rtos:main Oct 18, 2024
23 of 24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

susbys/dfu/img_util: support ERASE PROGRESSIVELY for non-flash mem #79152

susbys/dfu/img_util: support ERASE PROGRESSIVELY for non-flash mem #79152

nvlsianpu commented Sep 28, 2024

de-nordic Oct 8, 2024

de-nordic commented Oct 8, 2024

nordicjm Oct 10, 2024

nordicjm Oct 10, 2024

nordicjm Oct 10, 2024

	/* No alignment correction neede here, offset is corrected already
	/* No alignment correction needed here, offset is corrected already

	/* If there is need to erase trailer, that should happen before any
	/* If there is a need to erase the trailer, that should happen before any

susbys/dfu/img_util: support ERASE PROGRESSIVELY for non-flash mem #79152

susbys/dfu/img_util: support ERASE PROGRESSIVELY for non-flash mem #79152

Conversation

nvlsianpu commented Sep 28, 2024

de-nordic Oct 8, 2024

Choose a reason for hiding this comment

de-nordic commented Oct 8, 2024

nordicjm Oct 10, 2024

Choose a reason for hiding this comment

nordicjm Oct 10, 2024

Choose a reason for hiding this comment

nordicjm Oct 10, 2024

Choose a reason for hiding this comment