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

target/riscv: only restore mstatus.*ie bits in riscv_interrupts_restore 

When value of mstatus CSR changes while stepping with
"set_maskisr steponly", OpenOCD should not write back
the old value to mstatus when reenabling interrupts.

Signed-off-by: Samuel Obuch <samuel.obuch@espressif.com>
This commit is contained in:
Samuel Obuch 2025-02-04 16:27:23 +01:00
parent fa7e2351c8
commit adf3e85bac
2 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/target/riscv/riscv.c
View File

@ -292,6 +292,10 @@ static enum riscv_halt_reason riscv_halt_reason(struct target *target);
static void riscv_info_init(struct target *target, struct riscv_info *r); static void riscv_info_init(struct target *target, struct riscv_info *r);
static int riscv_step_rtos_hart(struct target *target); static int riscv_step_rtos_hart(struct target *target);
static const riscv_reg_t mstatus_ie_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE;
static int riscv_interrupts_disable(struct target *target, riscv_reg_t *old_mstatus);
static int riscv_interrupts_restore(struct target *target, riscv_reg_t old_mstatus);
static void riscv_sample_buf_maybe_add_timestamp(struct target *target, bool before) static void riscv_sample_buf_maybe_add_timestamp(struct target *target, bool before)
{ {
RISCV_INFO(r); RISCV_INFO(r);
@ -3643,9 +3647,8 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
} }
/* Disable Interrupts before attempting to run the algorithm. */ /* Disable Interrupts before attempting to run the algorithm. */
uint64_t current_mstatus; riscv_reg_t current_mstatus;
uint64_t irq_disabled_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE; if (riscv_interrupts_disable(target, &current_mstatus) != ERROR_OK)
if (riscv_interrupts_disable(target, irq_disabled_mask, &current_mstatus) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
/* Run algorithm */ /* Run algorithm */
@ -4167,14 +4170,12 @@ static int riscv_openocd_step_impl(struct target *target, int current,
} }
bool success = true; bool success = true;
uint64_t current_mstatus; riscv_reg_t current_mstatus;
RISCV_INFO(info); RISCV_INFO(info);
if (info->isrmask_mode == RISCV_ISRMASK_STEPONLY) { if (info->isrmask_mode == RISCV_ISRMASK_STEPONLY) {
/* Disable Interrupts before stepping. */ /* Disable Interrupts before stepping. */
uint64_t irq_disabled_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE; if (riscv_interrupts_disable(target, &current_mstatus) != ERROR_OK) {
if (riscv_interrupts_disable(target, irq_disabled_mask,
&current_mstatus) != ERROR_OK) {
success = false; success = false;
LOG_TARGET_ERROR(target, "Unable to disable interrupts."); LOG_TARGET_ERROR(target, "Unable to disable interrupts.");
goto _exit; goto _exit;
@ -5941,50 +5942,32 @@ static int riscv_resume_go_all_harts(struct target *target)
return ERROR_OK; return ERROR_OK;
} }
int riscv_interrupts_disable(struct target *target, uint64_t irq_mask, uint64_t *old_mstatus) static int riscv_interrupts_disable(struct target *target, riscv_reg_t *old_mstatus)
{ {
LOG_TARGET_DEBUG(target, "Disabling interrupts."); LOG_TARGET_DEBUG(target, "Disabling interrupts.");
struct reg *reg_mstatus = register_get_by_name(target->reg_cache, riscv_reg_t current_mstatus;
"mstatus", true); int ret = riscv_reg_get(target, &current_mstatus, GDB_REGNO_MSTATUS);
if (!reg_mstatus) { if (ret != ERROR_OK) {
LOG_TARGET_ERROR(target, "Couldn't find mstatus!"); LOG_TARGET_ERROR(target, "Failed to read mstatus!");
return ERROR_FAIL; return ret;
} }
int retval = reg_mstatus->type->get(reg_mstatus);
if (retval != ERROR_OK)
return retval;
RISCV_INFO(info);
uint8_t mstatus_bytes[8] = { 0 };
uint64_t current_mstatus = buf_get_u64(reg_mstatus->value, 0, reg_mstatus->size);
buf_set_u64(mstatus_bytes, 0, info->xlen, set_field(current_mstatus,
irq_mask, 0));
retval = reg_mstatus->type->set(reg_mstatus, mstatus_bytes);
if (retval != ERROR_OK)
return retval;
if (old_mstatus) if (old_mstatus)
*old_mstatus = current_mstatus; *old_mstatus = current_mstatus;
return riscv_reg_set(target, GDB_REGNO_MSTATUS, current_mstatus & ~mstatus_ie_mask);
return ERROR_OK;
} }
int riscv_interrupts_restore(struct target *target, uint64_t old_mstatus) static int riscv_interrupts_restore(struct target *target, riscv_reg_t old_mstatus)
{ {
LOG_TARGET_DEBUG(target, "Restoring interrupts."); LOG_TARGET_DEBUG(target, "Restoring interrupts.");
struct reg *reg_mstatus = register_get_by_name(target->reg_cache, riscv_reg_t current_mstatus;
"mstatus", true); int ret = riscv_reg_get(target, &current_mstatus, GDB_REGNO_MSTATUS);
if (!reg_mstatus) { if (ret != ERROR_OK) {
LOG_TARGET_ERROR(target, "Couldn't find mstatus!"); LOG_TARGET_ERROR(target, "Failed to read mstatus!");
return ERROR_FAIL; return ret;
} }
if ((current_mstatus & mstatus_ie_mask) != 0)
RISCV_INFO(info); LOG_TARGET_WARNING(target, "Interrupt enable bits in mstatus changed!");
uint8_t mstatus_bytes[8]; return riscv_reg_set(target, GDB_REGNO_MSTATUS, current_mstatus | (old_mstatus & mstatus_ie_mask));
buf_set_u64(mstatus_bytes, 0, info->xlen, old_mstatus);
return reg_mstatus->type->set(reg_mstatus, mstatus_bytes);
} }
static int riscv_step_rtos_hart(struct target *target) static int riscv_step_rtos_hart(struct target *target)

3
src/target/riscv/riscv.h
View File

@ -502,7 +502,4 @@ void riscv_add_bscan_tunneled_scan(struct jtag_tap *tap, const struct scan_field
int riscv_read_by_any_size(struct target *target, target_addr_t address, uint32_t size, uint8_t *buffer); int riscv_read_by_any_size(struct target *target, target_addr_t address, uint32_t size, uint8_t *buffer);
int riscv_write_by_any_size(struct target *target, target_addr_t address, uint32_t size, uint8_t *buffer); int riscv_write_by_any_size(struct target *target, target_addr_t address, uint32_t size, uint8_t *buffer);
int riscv_interrupts_disable(struct target *target, uint64_t ie_mask, uint64_t *old_mstatus);
int riscv_interrupts_restore(struct target *target, uint64_t old_mstatus);
#endif /* OPENOCD_TARGET_RISCV_RISCV_H */ #endif /* OPENOCD_TARGET_RISCV_RISCV_H */