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

flash/nor/rp2040: fix setting sp 

The num_reg_params parameter of target_run_algorithm() was not
updated when setting "sp" was introduced. Therefore "sp" as the last
register parameter was not passed to a target algo.

Introduce a new helper variable with correct count of register parameters
and use it everywhere needed.

Change-Id: I934a71380783d98917167f1569145808ef23540f
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/7225
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Tomas Vanek 2022-09-27 10:13:18 +02:00 committed by Antonio Borneo
parent ae937791d3
commit dce9a03cb2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/flash/nor/rp2040.c
View File

@ -111,11 +111,12 @@ static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank
/* Pass function pointer in r7 */ /* Pass function pointer in r7 */
init_reg_param(&args[n_args], "r7", 32, PARAM_OUT); init_reg_param(&args[n_args], "r7", 32, PARAM_OUT);
buf_set_u32(args[n_args].value, 0, 32, func_offset); buf_set_u32(args[n_args].value, 0, 32, func_offset);
/* Setup stack */
init_reg_param(&args[n_args + 1], "sp", 32, PARAM_OUT); init_reg_param(&args[n_args + 1], "sp", 32, PARAM_OUT);
buf_set_u32(args[n_args + 1].value, 0, 32, stacktop); buf_set_u32(args[n_args + 1].value, 0, 32, stacktop);
unsigned int n_reg_params = n_args + 2; /* User arguments + r7 + sp */
for (unsigned int i = 0; i < n_reg_params; ++i)
for (unsigned int i = 0; i < n_args + 2; ++i)
LOG_DEBUG("Set %s = 0x%" PRIx32, args[i].reg_name, buf_get_u32(args[i].value, 0, 32)); LOG_DEBUG("Set %s = 0x%" PRIx32, args[i].reg_name, buf_get_u32(args[i].value, 0, 32));
/* Actually call the function */ /* Actually call the function */
@ -124,17 +125,19 @@ static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank
int err = target_run_algorithm( int err = target_run_algorithm(
target, target,
0, NULL, /* No memory arguments */ 0, NULL, /* No memory arguments */
n_args + 1, args, /* User arguments + r7 */ n_reg_params, args, /* User arguments + r7 + sp */
priv->jump_debug_trampoline, priv->jump_debug_trampoline_end, priv->jump_debug_trampoline, priv->jump_debug_trampoline_end,
timeout_ms, timeout_ms,
&alg_info &alg_info
); );
for (unsigned int i = 0; i < n_args + 2; ++i)
for (unsigned int i = 0; i < n_reg_params; ++i)
destroy_reg_param(&args[i]); destroy_reg_param(&args[i]);
if (err != ERROR_OK) if (err != ERROR_OK)
LOG_ERROR("Failed to invoke ROM function @0x%" PRIx16, func_offset); LOG_ERROR("Failed to invoke ROM function @0x%" PRIx16, func_offset);
return err;
return err;
} }
/* Finalize flash write/erase/read ID /* Finalize flash write/erase/read ID