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

Merge pull request #903 from wxjstz/riscv 

target/riscv: fix execute_fence
This commit is contained in:
Tim Newsome 2023-08-18 09:32:51 -07:00 committed by GitHub
parent f061623568 373b8f1a89
commit 5cb60e3f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2920,15 +2920,35 @@ static int execute_fence(struct target *target)
/* FIXME: For non-coherent systems we need to flush the caches right /* FIXME: For non-coherent systems we need to flush the caches right
* here, but there's no ISA-defined way of doing that. */ * here, but there's no ISA-defined way of doing that. */
int result;
struct riscv_program program; struct riscv_program program;
riscv_program_init(&program, target);
riscv_program_fence_i(&program);
riscv_program_fence_rw_rw(&program);
int result = riscv_program_exec(&program, target);
if (result != ERROR_OK)
LOG_TARGET_DEBUG(target, "Unable to execute pre-fence");
return ERROR_OK; if (has_sufficient_progbuf(target, 3)) {
riscv_program_init(&program, target);
riscv_program_fence_rw_rw(&program);
riscv_program_fence_i(&program);
result = riscv_program_exec(&program, target);
if (result != ERROR_OK)
LOG_TARGET_DEBUG(target, "Unable to execute pre-fence");
return ERROR_OK;
}
if (has_sufficient_progbuf(target, 2)) {
riscv_program_init(&program, target);
riscv_program_fence_i(&program);
result = riscv_program_exec(&program, target);
if (result != ERROR_OK)
LOG_TARGET_DEBUG(target, "Unable to execute fence.i");
riscv_program_init(&program, target);
riscv_program_fence_rw_rw(&program);
result = riscv_program_exec(&program, target);
if (result != ERROR_OK)
LOG_TARGET_DEBUG(target, "Unable to execute fence rw, rw");
return ERROR_OK;
}
return ERROR_FAIL;
} }
static void log_memory_access128(target_addr_t address, uint64_t value_h, static void log_memory_access128(target_addr_t address, uint64_t value_h,
@ -5070,7 +5090,7 @@ void riscv013_fill_dm_nop_u64(struct target *target, char *buf)
static int maybe_execute_fence_i(struct target *target) static int maybe_execute_fence_i(struct target *target)
{ {
if (has_sufficient_progbuf(target, 3)) if (has_sufficient_progbuf(target, 2))
return execute_fence(target); return execute_fence(target);
return ERROR_OK; return ERROR_OK;
} }