interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from riscv/fespi 

fix fespi flash after registers were renamed.
This commit is contained in:
Tim Newsome 2017-12-22 12:00:11 -08:00 committed by GitHub
parent 33ef457c6a 1f66c7827b
commit 6c719f0ab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/flash/nor/fespi.c
View File

@ -598,7 +598,7 @@ struct algorithm_steps {
uint8_t **steps; uint8_t **steps;
}; };
struct algorithm_steps *as_new(unsigned size) static struct algorithm_steps *as_new(unsigned size)
{ {
struct algorithm_steps *as = calloc(1, sizeof(struct algorithm_steps)); struct algorithm_steps *as = calloc(1, sizeof(struct algorithm_steps));
as->size = size; as->size = size;
@ -606,7 +606,7 @@ struct algorithm_steps *as_new(unsigned size)
return as; return as;
} }
struct algorithm_steps *as_delete(struct algorithm_steps *as) static struct algorithm_steps *as_delete(struct algorithm_steps *as)
{ {
for (unsigned step = 0; step < as->used; step++) { for (unsigned step = 0; step < as->used; step++) {
free(as->steps[step]); free(as->steps[step]);
@ -616,7 +616,7 @@ struct algorithm_steps *as_delete(struct algorithm_steps *as)
return NULL; return NULL;
} }
int as_empty(struct algorithm_steps *as) static int as_empty(struct algorithm_steps *as)
{ {
for (unsigned s = 0; s < as->used; s++) { for (unsigned s = 0; s < as->used; s++) {
if (as->steps[s][0] != STEP_NOP) if (as->steps[s][0] != STEP_NOP)
@ -626,7 +626,7 @@ int as_empty(struct algorithm_steps *as)
} }
// Return size of compiled program. // Return size of compiled program.
unsigned as_compile(struct algorithm_steps *as, uint8_t *target, static unsigned as_compile(struct algorithm_steps *as, uint8_t *target,
unsigned target_size) unsigned target_size)
{ {
unsigned offset = 0; unsigned offset = 0;
@ -693,7 +693,7 @@ unsigned as_compile(struct algorithm_steps *as, uint8_t *target,
return offset; return offset;
} }
void as_add_tx(struct algorithm_steps *as, unsigned count, const uint8_t *data) static void as_add_tx(struct algorithm_steps *as, unsigned count, const uint8_t *data)
{ {
LOG_DEBUG("count=%d", count); LOG_DEBUG("count=%d", count);
while (count > 0) { while (count > 0) {
@ -709,14 +709,14 @@ void as_add_tx(struct algorithm_steps *as, unsigned count, const uint8_t *data)
} }
} }
void as_add_tx1(struct algorithm_steps *as, uint8_t byte) static void as_add_tx1(struct algorithm_steps *as, uint8_t byte)
{ {
uint8_t data[1]; uint8_t data[1];
data[0] = byte; data[0] = byte;
as_add_tx(as, 1, data); as_add_tx(as, 1, data);
} }
void as_add_write_reg(struct algorithm_steps *as, uint8_t offset, uint8_t data) static void as_add_write_reg(struct algorithm_steps *as, uint8_t offset, uint8_t data)
{ {
assert(as->used < as->size); assert(as->used < as->size);
as->steps[as->used] = malloc(3); as->steps[as->used] = malloc(3);
@ -726,7 +726,7 @@ void as_add_write_reg(struct algorithm_steps *as, uint8_t offset, uint8_t data)
as->used++; as->used++;
} }
void as_add_txwm_wait(struct algorithm_steps *as) static void as_add_txwm_wait(struct algorithm_steps *as)
{ {
assert(as->used < as->size); assert(as->used < as->size);
as->steps[as->used] = malloc(1); as->steps[as->used] = malloc(1);
@ -734,7 +734,7 @@ void as_add_txwm_wait(struct algorithm_steps *as)
as->used++; as->used++;
} }
void as_add_wip_wait(struct algorithm_steps *as) static void as_add_wip_wait(struct algorithm_steps *as)
{ {
assert(as->used < as->size); assert(as->used < as->size);
as->steps[as->used] = malloc(1); as->steps[as->used] = malloc(1);
@ -742,7 +742,7 @@ void as_add_wip_wait(struct algorithm_steps *as)
as->used++; as->used++;
} }
void as_add_set_dir(struct algorithm_steps *as, bool dir) static void as_add_set_dir(struct algorithm_steps *as, bool dir)
{ {
assert(as->used < as->size); assert(as->used < as->size);
as->steps[as->used] = malloc(2); as->steps[as->used] = malloc(2);
@ -792,8 +792,8 @@ static int steps_execute(struct algorithm_steps *as,
int xlen = riscv_xlen(target); int xlen = riscv_xlen(target);
struct reg_param reg_params[2]; struct reg_param reg_params[2];
init_reg_param(&reg_params[0], "x10", xlen, PARAM_OUT); init_reg_param(&reg_params[0], "a0", xlen, PARAM_OUT);
init_reg_param(&reg_params[1], "x11", xlen, PARAM_OUT); init_reg_param(&reg_params[1], "a1", xlen, PARAM_OUT);
buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base); buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base);
buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address); buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address);
while (!as_empty(as)) { while (!as_empty(as)) {
@ -964,6 +964,8 @@ err:
target_free_working_area(target, algorithm_wa); target_free_working_area(target, algorithm_wa);
} }
as_delete(as);
/* Switch to HW mode before return to prompt */ /* Switch to HW mode before return to prompt */
FESPI_ENABLE_HW_MODE(); FESPI_ENABLE_HW_MODE();
return retval; return retval;

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

@ -854,10 +854,13 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
uint8_t mstatus_bytes[8]; uint8_t mstatus_bytes[8];
LOG_DEBUG("Disabling Interrupts"); LOG_DEBUG("Disabling Interrupts");
char mstatus_name[20];
sprintf(mstatus_name, "csr%d", CSR_MSTATUS);
struct reg *reg_mstatus = register_get_by_name(target->reg_cache, struct reg *reg_mstatus = register_get_by_name(target->reg_cache,
mstatus_name, 1); "mstatus", 1);
if (!reg_mstatus) {
LOG_ERROR("Couldn't find mstatus!");
return ERROR_FAIL;
}
reg_mstatus->type->get(reg_mstatus); reg_mstatus->type->get(reg_mstatus);
current_mstatus = buf_get_u64(reg_mstatus->value, 0, reg_mstatus->size); current_mstatus = buf_get_u64(reg_mstatus->value, 0, reg_mstatus->size);
uint64_t ie_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE; uint64_t ie_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE;