interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flash/nor/kinetis: use target_get_working_area_avail() 

Since e22c6484ea the trial/error allocation shows
"not enough working area available(requested 2048)" message
on klx.cfg. The message is not clear if it means a problem or not.

Replace with new style allocation using target_get_working_area_avail()

Change-Id: I87fe1e38248fcac29982b72aaba12217a0552f38
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5752
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Tomas Vanek 2020-07-02 09:33:57 +02:00
parent e8cfdd4a72
commit 8d7ca43775
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/flash/nor/kinetis.c
View File

@ -1250,7 +1250,7 @@ static int kinetis_write_block(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t wcount) uint32_t offset, uint32_t wcount)
{ {
struct target *target = bank->target; struct target *target = bank->target;
uint32_t buffer_size = 2048; /* Default minimum value */ uint32_t buffer_size;
struct working_area *write_algorithm; struct working_area *write_algorithm;
struct working_area *source; struct working_area *source;
struct kinetis_flash_bank *k_bank = bank->driver_priv; struct kinetis_flash_bank *k_bank = bank->driver_priv;
@ -1261,10 +1261,6 @@ static int kinetis_write_block(struct flash_bank *bank, const uint8_t *buffer,
int retval; int retval;
uint8_t fstat; uint8_t fstat;
/* Increase buffer_size if needed */
if (buffer_size < (target->working_area_size/2))
buffer_size = (target->working_area_size/2);
/* allocate working area with flash programming code */ /* allocate working area with flash programming code */
if (target_alloc_working_area(target, sizeof(kinetis_flash_write_code), if (target_alloc_working_area(target, sizeof(kinetis_flash_write_code),
&write_algorithm) != ERROR_OK) { &write_algorithm) != ERROR_OK) {
@ -1277,16 +1273,19 @@ static int kinetis_write_block(struct flash_bank *bank, const uint8_t *buffer,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* memory buffer */ /* memory buffer, size *must* be multiple of word */
while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) { buffer_size = target_get_working_area_avail(target) & ~(sizeof(uint32_t) - 1);
buffer_size /= 4; if (buffer_size < 256) {
if (buffer_size <= 256) { LOG_WARNING("large enough working area not available, can't do block memory writes");
/* free working area, write algorithm already allocated */ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
target_free_working_area(target, write_algorithm); } else if (buffer_size > 16384) {
/* probably won't benefit from more than 16k ... */
buffer_size = 16384;
}
LOG_WARNING("No large enough working area available, can't do block memory writes"); if (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) {
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; LOG_ERROR("allocating working area failed");
} return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
} }
armv7m_info.common_magic = ARMV7M_COMMON_MAGIC; armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;