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

target/riscv: add nuclei customized init resethalt command 

init resethalt is used to halt the cpu when reset

Change-Id: I5c504599c10da204c0e9f933d33f61fe75ed033c
Signed-off-by: wangyanwen <wangyanwen@nucleisys.com>
This commit is contained in:
wangyanwen 2023-10-09 11:46:23 +08:00 committed by Huaqi Fang
parent 22ac8c3d68
commit 2f7f61f402
4 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/openocd.c
View File

@ -107,10 +107,16 @@ COMMAND_HANDLER(handle_noinit_command)
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
COMMAND_HANDLER(handle_init_command)
{
bool resethalt = false;
if (CMD_ARGC != 0)
if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
if (CMD_ARGC == 1) {
if (strcmp("resethalt", CMD_ARGV[0]) == 0)
resethalt = true;
}
int retval;
static int initialized;
if (initialized)
@ -120,7 +126,11 @@ COMMAND_HANDLER(handle_init_command)
bool save_poll_mask = jtag_poll_mask();
retval = command_run_line(CMD_CTX, "target init");
if (resethalt)
retval = command_run_line(CMD_CTX, "target init resethalt");
else
retval = command_run_line(CMD_CTX, "target init");
if (retval != ERROR_OK)
return ERROR_FAIL;
@ -213,7 +223,7 @@ static const struct command_registration openocd_command_handlers[] = {
"Changes command mode from CONFIG to EXEC. "
"Unless 'noinit' is called, this command is "
"called automatically at the end of startup.",
.usage = ""
.usage = "[resethalt]"
},
{
.name = "add_script_search_dir",

7
src/target/riscv/riscv-013.c
View File

@ -1844,6 +1844,13 @@ static int examine_dm(struct target *target)
dm->current_hartid = HART_INDEX_UNKNOWN;
if (target->resethalt_during_init) {
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_SETRESETHALTREQ | DM_DMCONTROL_DMACTIVE);
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_NDMRESET | DM_DMCONTROL_DMACTIVE);
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_DMACTIVE);
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_CLRRESETHALTREQ | DM_DMCONTROL_DMACTIVE);
}
result = dm_write(target, DM_DMCONTROL, DM_DMCONTROL_HARTSELLO |
DM_DMCONTROL_HARTSELHI | DM_DMCONTROL_DMACTIVE |
DM_DMCONTROL_HASEL);

15
src/target/target.c
View File

@ -1539,7 +1539,7 @@ static int target_init_one(struct command_context *cmd_ctx,
return ERROR_OK;
}
static int target_init(struct command_context *cmd_ctx)
static int target_init(struct command_context *cmd_ctx, bool resethalt)
{
struct target *target;
int retval;
@ -1548,6 +1548,7 @@ static int target_init(struct command_context *cmd_ctx)
retval = target_init_one(cmd_ctx, target);
if (retval != ERROR_OK)
return retval;
target->resethalt_during_init = resethalt;
}
if (!all_targets)
@ -1568,10 +1569,16 @@ static int target_init(struct command_context *cmd_ctx)
COMMAND_HANDLER(handle_target_init_command)
{
int retval;
bool resethalt = false;
if (CMD_ARGC != 0)
if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
if (CMD_ARGC == 1) {
if (strcmp("resethalt", CMD_ARGV[0]) == 0)
resethalt = true;
}
static bool target_initialized;
if (target_initialized) {
LOG_INFO("'target init' has already been called");
@ -1592,7 +1599,7 @@ COMMAND_HANDLER(handle_target_init_command)
return retval;
LOG_DEBUG("Initializing targets...");
return target_init(CMD_CTX);
return target_init(CMD_CTX, resethalt);
}
int target_register_event_callback(int (*callback)(struct target *target,
@ -6050,7 +6057,7 @@ static const struct command_registration target_subcommand_handlers[] = {
.mode = COMMAND_CONFIG,
.handler = handle_target_init_command,
.help = "initialize targets",
.usage = "",
.usage = "[resethalt]",
},
{
.name = "create",

1
src/target/target.h
View File

@ -213,6 +213,7 @@ struct target {
/* The semihosting information, extracted from the target. */
struct semihosting *semihosting;
bool resethalt_during_init;
};
struct target_list {