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

src/target/riscv: conditionally log priv register read failures 

- Only log error if target is not running or in debug running state.
- Refine logging for consistency across functions.

Change-Id: Ic1a8b0e379dca06f01786feb9aa9ef5892e1d789
Signed-off-by: Huaqi Fang <578567190@qq.com>
This commit is contained in:
Huaqi Fang 2024-12-13 10:31:03 +08:00
parent 745eaa7c63
commit c917af5e16
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2813,7 +2813,8 @@ static int riscv_effective_privilege_mode(struct target *target, int *v_mode, in
{ {
riscv_reg_t priv; riscv_reg_t priv;
if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) { if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) {
LOG_TARGET_ERROR(target, "Failed to read priv register."); if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
LOG_TARGET_ERROR(target, "Failed to read priv register.");
return ERROR_FAIL; return ERROR_FAIL;
} }
*v_mode = get_field(priv, VIRT_PRIV_V); *v_mode = get_field(priv, VIRT_PRIV_V);
@ -2844,7 +2845,8 @@ static int riscv_mmu(struct target *target, int *enabled)
/* Don't use MMU in explicit or effective M (machine) mode */ /* Don't use MMU in explicit or effective M (machine) mode */
riscv_reg_t priv; riscv_reg_t priv;
if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) { if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) {
LOG_TARGET_ERROR(target, "Failed to read priv register."); if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
LOG_TARGET_ERROR(target, "Failed to read priv register.");
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -3146,7 +3148,8 @@ static int riscv_virt2phys(struct target *target, target_addr_t virtual, target_
riscv_reg_t priv; riscv_reg_t priv;
if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) { if (riscv_reg_get(target, &priv, GDB_REGNO_PRIV) != ERROR_OK) {
LOG_TARGET_ERROR(target, "Failed to read priv register."); if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
LOG_TARGET_ERROR(target, "Failed to read priv register.");
return ERROR_FAIL; return ERROR_FAIL;
} }