From 84d73d0225407594ed9cf646fa3dd8a5752df7ad Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Sun, 11 Sep 2022 12:11:31 +0200 Subject: [PATCH] flash/nor/rp2040: fix size of flash write buffer The size of the flash write buffer should be rounded down to the multiply of flash page size. Using write chunks of unadjusted size results in write of chunks unaligned to flash pages. Change-Id: If7931362ee193dff4dc2df7ec78f13530658cf08 Signed-off-by: Tomas Vanek Reviewed-on: https://review.openocd.org/c/openocd/+/7187 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/flash/nor/rp2040.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/flash/nor/rp2040.c b/src/flash/nor/rp2040.c index 1c57424f9..ce09fea08 100644 --- a/src/flash/nor/rp2040.c +++ b/src/flash/nor/rp2040.c @@ -217,7 +217,11 @@ static int rp2040_flash_write(struct flash_bank *bank, const uint8_t *buffer, ui if (err != ERROR_OK) goto cleanup; - const unsigned int chunk_size = target_get_working_area_avail(target); + unsigned int avail_pages = target_get_working_area_avail(target) / priv->dev->pagesize; + /* We try to allocate working area rounded down to device page size, + * al least 1 page, at most the write data size + */ + unsigned int chunk_size = MIN(MAX(avail_pages, 1) * priv->dev->pagesize, count); err = target_alloc_working_area(target, chunk_size, &bounce); if (err != ERROR_OK) { LOG_ERROR("Could not allocate bounce buffer for flash programming. Can't continue"); -- 2.30.2