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

aarch64: make DCC read/write functions operate on struct armv8_common 

Change the signature of aarch64_(read|write)_dcc[_64] to take a
"struct armv8_common *" as the context to operate on. No functional
change.

Change-Id: Ie501113f65ea22aff2eee173ec717f6908a63494
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
This commit is contained in:
Matthias Welwarsky 2016-09-01 21:14:46 +02:00
parent a3b9e12aec
commit db97bb4a9d
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/target/aarch64.c
View File

@ -234,26 +234,26 @@ static inline struct aarch64_common *dpm_to_a8(struct arm_dpm *dpm)
return container_of(dpm, struct aarch64_common, armv8_common.dpm); return container_of(dpm, struct aarch64_common, armv8_common.dpm);
} }
static int aarch64_write_dcc(struct aarch64_common *a8, uint32_t data) static int aarch64_write_dcc(struct armv8_common *armv8, uint32_t data)
{ {
LOG_DEBUG("write DCC 0x%08" PRIx32, data); LOG_DEBUG("write DCC 0x%08" PRIx32, data);
return mem_ap_write_u32(a8->armv8_common.debug_ap, return mem_ap_write_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRRX, data); armv8->debug_base + CPUDBG_DTRRX, data);
} }
static int aarch64_write_dcc_64(struct aarch64_common *a8, uint64_t data) static int aarch64_write_dcc_64(struct armv8_common *armv8, uint64_t data)
{ {
int ret; int ret;
LOG_DEBUG("write DCC 0x%08" PRIx32, (unsigned)data); LOG_DEBUG("write DCC Low word0x%08" PRIx32, (unsigned)data);
LOG_DEBUG("write DCC 0x%08" PRIx32, (unsigned)(data >> 32)); LOG_DEBUG("write DCC High word 0x%08" PRIx32, (unsigned)(data >> 32));
ret = mem_ap_write_u32(a8->armv8_common.debug_ap, ret = mem_ap_write_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRRX, data); armv8->debug_base + CPUDBG_DTRRX, data);
ret += mem_ap_write_u32(a8->armv8_common.debug_ap, ret += mem_ap_write_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRTX, data >> 32); armv8->debug_base + CPUDBG_DTRTX, data >> 32);
return ret; return ret;
} }
static int aarch64_read_dcc(struct aarch64_common *a8, uint32_t *data, static int aarch64_read_dcc(struct armv8_common *armv8, uint32_t *data,
uint32_t *dscr_p) uint32_t *dscr_p)
{ {
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
@ -265,8 +265,8 @@ static int aarch64_read_dcc(struct aarch64_common *a8, uint32_t *data,
/* Wait for DTRRXfull */ /* Wait for DTRRXfull */
long long then = timeval_ms(); long long then = timeval_ms();
while ((dscr & DSCR_DTR_TX_FULL) == 0) { while ((dscr & DSCR_DTR_TX_FULL) == 0) {
retval = mem_ap_read_atomic_u32(a8->armv8_common.debug_ap, retval = mem_ap_read_atomic_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DSCR, armv8->debug_base + CPUDBG_DSCR,
&dscr); &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -276,8 +276,8 @@ static int aarch64_read_dcc(struct aarch64_common *a8, uint32_t *data,
} }
} }
retval = mem_ap_read_atomic_u32(a8->armv8_common.debug_ap, retval = mem_ap_read_atomic_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRTX, armv8->debug_base + CPUDBG_DTRTX,
data); data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -288,7 +288,8 @@ static int aarch64_read_dcc(struct aarch64_common *a8, uint32_t *data,
return retval; return retval;
} }
static int aarch64_read_dcc_64(struct aarch64_common *a8, uint64_t *data,
static int aarch64_read_dcc_64(struct armv8_common *armv8, uint64_t *data,
uint32_t *dscr_p) uint32_t *dscr_p)
{ {
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
@ -301,8 +302,8 @@ static int aarch64_read_dcc_64(struct aarch64_common *a8, uint64_t *data,
/* Wait for DTRRXfull */ /* Wait for DTRRXfull */
long long then = timeval_ms(); long long then = timeval_ms();
while ((dscr & DSCR_DTR_TX_FULL) == 0) { while ((dscr & DSCR_DTR_TX_FULL) == 0) {
retval = mem_ap_read_atomic_u32(a8->armv8_common.debug_ap, retval = mem_ap_read_atomic_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DSCR, armv8->debug_base + CPUDBG_DSCR,
&dscr); &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -312,14 +313,14 @@ static int aarch64_read_dcc_64(struct aarch64_common *a8, uint64_t *data,
} }
} }
retval = mem_ap_read_atomic_u32(a8->armv8_common.debug_ap, retval = mem_ap_read_atomic_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRTX, armv8->debug_base + CPUDBG_DTRTX,
(uint32_t *)data); (uint32_t *)data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = mem_ap_read_atomic_u32(a8->armv8_common.debug_ap, retval = mem_ap_read_atomic_u32(armv8->debug_ap,
a8->armv8_common.debug_base + CPUDBG_DTRRX, armv8->debug_base + CPUDBG_DTRRX,
&higher); &higher);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -395,7 +396,7 @@ static int aarch64_instr_write_data_dcc(struct arm_dpm *dpm,
int retval; int retval;
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
retval = aarch64_write_dcc(a8, data); retval = aarch64_write_dcc(&a8->armv8_common, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -412,7 +413,7 @@ static int aarch64_instr_write_data_dcc_64(struct arm_dpm *dpm,
int retval; int retval;
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
retval = aarch64_write_dcc_64(a8, data); retval = aarch64_write_dcc_64(&a8->armv8_common, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -429,7 +430,7 @@ static int aarch64_instr_write_data_r0(struct arm_dpm *dpm,
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
int retval; int retval;
retval = aarch64_write_dcc(a8, data); retval = aarch64_write_dcc(&a8->armv8_common, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -456,7 +457,7 @@ static int aarch64_instr_write_data_r0_64(struct arm_dpm *dpm,
uint32_t dscr = DSCR_INSTR_COMP; uint32_t dscr = DSCR_INSTR_COMP;
int retval; int retval;
retval = aarch64_write_dcc_64(a8, data); retval = aarch64_write_dcc_64(&a8->armv8_common, data);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -502,7 +503,7 @@ static int aarch64_instr_read_data_dcc(struct arm_dpm *dpm,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return aarch64_read_dcc(a8, data, &dscr); return aarch64_read_dcc(&a8->armv8_common, data, &dscr);
} }
static int aarch64_instr_read_data_dcc_64(struct arm_dpm *dpm, static int aarch64_instr_read_data_dcc_64(struct arm_dpm *dpm,
@ -520,7 +521,7 @@ static int aarch64_instr_read_data_dcc_64(struct arm_dpm *dpm,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return aarch64_read_dcc_64(a8, data, &dscr); return aarch64_read_dcc_64(&a8->armv8_common, data, &dscr);
} }
static int aarch64_instr_read_data_r0(struct arm_dpm *dpm, static int aarch64_instr_read_data_r0(struct arm_dpm *dpm,
@ -546,7 +547,7 @@ static int aarch64_instr_read_data_r0(struct arm_dpm *dpm,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return aarch64_read_dcc(a8, data, &dscr); return aarch64_read_dcc(&a8->armv8_common, data, &dscr);
} }
static int aarch64_instr_read_data_r0_64(struct arm_dpm *dpm, static int aarch64_instr_read_data_r0_64(struct arm_dpm *dpm,
@ -572,7 +573,7 @@ static int aarch64_instr_read_data_r0_64(struct arm_dpm *dpm,
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return aarch64_read_dcc_64(a8, data, &dscr); return aarch64_read_dcc_64(&a8->armv8_common, data, &dscr);
} }
static int aarch64_bpwp_enable(struct arm_dpm *dpm, unsigned index_t, static int aarch64_bpwp_enable(struct arm_dpm *dpm, unsigned index_t,