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

aarch64: refactor SCTLR manipulation 

Reduce SLOCs in SCTLR retrieval and modification functions and make them
less complex.

Change-Id: Ida1a99c223743247f171b52eef80dc9886802101
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Reviewed-on: http://openocd.zylin.com/3982
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Matthias Welwarsky 2016-11-14 12:18:43 +01:00 committed by Paul Fertser
parent 5d00fd9d1d
commit f988f59604
2 changed files with 98 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/target/aarch64.c
View File

@ -49,7 +49,9 @@ static int aarch64_read_apb_ap_memory(struct target *target,
static int aarch64_restore_system_control_reg(struct target *target) static int aarch64_restore_system_control_reg(struct target *target)
{ {
enum arm_mode target_mode = ARM_MODE_ANY;
int retval = ERROR_OK; int retval = ERROR_OK;
uint32_t instr;
struct aarch64_common *aarch64 = target_to_aarch64(target); struct aarch64_common *aarch64 = target_to_aarch64(target);
struct armv8_common *armv8 = target_to_armv8(target); struct armv8_common *armv8 = target_to_armv8(target);
@ -59,41 +61,45 @@ static int aarch64_restore_system_control_reg(struct target *target)
/* LOG_INFO("cp15_control_reg: %8.8" PRIx32, cortex_v8->cp15_control_reg); */ /* LOG_INFO("cp15_control_reg: %8.8" PRIx32, cortex_v8->cp15_control_reg); */
switch (armv8->arm.core_mode) { switch (armv8->arm.core_mode) {
case ARMV8_64_EL0T: case ARMV8_64_EL0T:
case ARMV8_64_EL1T: target_mode = ARMV8_64_EL1H;
case ARMV8_64_EL1H: /* fall through */
retval = armv8->arm.msr(target, 3, /*op 0*/ case ARMV8_64_EL1T:
0, 1, /* op1, op2 */ case ARMV8_64_EL1H:
0, 0, /* CRn, CRm */ instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL1, 0);
aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
case ARMV8_64_EL2T: case ARMV8_64_EL2T:
case ARMV8_64_EL2H: case ARMV8_64_EL2H:
retval = armv8->arm.msr(target, 3, /*op 0*/ instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL2, 0);
4, 1, /* op1, op2 */
0, 0, /* CRn, CRm */
aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
case ARMV8_64_EL3H: case ARMV8_64_EL3H:
case ARMV8_64_EL3T: case ARMV8_64_EL3T:
retval = armv8->arm.msr(target, 3, /*op 0*/ instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL3, 0);
6, 1, /* op1, op2 */
0, 0, /* CRn, CRm */
aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
default:
retval = armv8->arm.mcr(target, 15, 0, 0, 1, 0, aarch64->system_control_reg); case ARM_MODE_SVC:
if (retval != ERROR_OK) case ARM_MODE_ABT:
return retval; case ARM_MODE_FIQ:
break; case ARM_MODE_IRQ:
} instr = ARMV4_5_MCR(15, 0, 0, 1, 0, 0);
break;
default:
LOG_INFO("cannot read system control register in this mode");
return ERROR_FAIL;
}
if (target_mode != ARM_MODE_ANY)
armv8_dpm_modeswitch(&armv8->dpm, target_mode);
retval = armv8->dpm.instr_write_data_r0(&armv8->dpm, instr, aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
if (target_mode != ARM_MODE_ANY)
armv8_dpm_modeswitch(&armv8->dpm, ARM_MODE_ANY);
} }
return retval; return retval;
} }
@ -112,6 +118,7 @@ static int aarch64_mmu_modify(struct target *target, int enable)
struct aarch64_common *aarch64 = target_to_aarch64(target); struct aarch64_common *aarch64 = target_to_aarch64(target);
struct armv8_common *armv8 = &aarch64->armv8_common; struct armv8_common *armv8 = &aarch64->armv8_common;
int retval = ERROR_OK; int retval = ERROR_OK;
uint32_t instr = 0;
if (enable) { if (enable) {
/* if mmu enabled at target stop and mmu not enable */ /* if mmu enabled at target stop and mmu not enable */
@ -119,86 +126,42 @@ static int aarch64_mmu_modify(struct target *target, int enable)
LOG_ERROR("trying to enable mmu on target stopped with mmu disable"); LOG_ERROR("trying to enable mmu on target stopped with mmu disable");
return ERROR_FAIL; return ERROR_FAIL;
} }
if (!(aarch64->system_control_reg_curr & 0x1U)) { if (!(aarch64->system_control_reg_curr & 0x1U))
aarch64->system_control_reg_curr |= 0x1U; aarch64->system_control_reg_curr |= 0x1U;
switch (armv8->arm.core_mode) {
case ARMV8_64_EL0T:
case ARMV8_64_EL1T:
case ARMV8_64_EL1H:
retval = armv8->arm.msr(target, 3, /*op 0*/
0, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
case ARMV8_64_EL2T:
case ARMV8_64_EL2H:
retval = armv8->arm.msr(target, 3, /*op 0*/
4, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
case ARMV8_64_EL3H:
case ARMV8_64_EL3T:
retval = armv8->arm.msr(target, 3, /*op 0*/
6, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
default:
LOG_DEBUG("unknow cpu state 0x%x" PRIx32, armv8->arm.core_state);
}
}
} else { } else {
if (aarch64->system_control_reg_curr & 0x4U) { if (aarch64->system_control_reg_curr & 0x4U) {
/* data cache is active */ /* data cache is active */
aarch64->system_control_reg_curr &= ~0x4U; aarch64->system_control_reg_curr &= ~0x4U;
/* flush data cache armv7 function to be called */ /* flush data cache armv8 function to be called */
if (armv8->armv8_mmu.armv8_cache.flush_all_data_cache) if (armv8->armv8_mmu.armv8_cache.flush_all_data_cache)
armv8->armv8_mmu.armv8_cache.flush_all_data_cache(target); armv8->armv8_mmu.armv8_cache.flush_all_data_cache(target);
} }
if ((aarch64->system_control_reg_curr & 0x1U)) { if ((aarch64->system_control_reg_curr & 0x1U)) {
aarch64->system_control_reg_curr &= ~0x1U; aarch64->system_control_reg_curr &= ~0x1U;
switch (armv8->arm.core_mode) {
case ARMV8_64_EL0T:
case ARMV8_64_EL1T:
case ARMV8_64_EL1H:
retval = armv8->arm.msr(target, 3, /*op 0*/
0, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
case ARMV8_64_EL2T:
case ARMV8_64_EL2H:
retval = armv8->arm.msr(target, 3, /*op 0*/
4, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
case ARMV8_64_EL3H:
case ARMV8_64_EL3T:
retval = armv8->arm.msr(target, 3, /*op 0*/
6, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
aarch64->system_control_reg_curr);
if (retval != ERROR_OK)
return retval;
break;
default:
LOG_DEBUG("unknow cpu state 0x%x" PRIx32, armv8->arm.core_state);
break;
}
} }
} }
switch (armv8->arm.core_mode) {
case ARMV8_64_EL0T:
case ARMV8_64_EL1T:
case ARMV8_64_EL1H:
instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL1, 0);
break;
case ARMV8_64_EL2T:
case ARMV8_64_EL2H:
instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL2, 0);
break;
case ARMV8_64_EL3H:
case ARMV8_64_EL3T:
instr = ARMV8_MSR_GP(SYSTEM_SCTLR_EL3, 0);
break;
default:
LOG_DEBUG("unknown cpu state 0x%x" PRIx32, armv8->arm.core_state);
break;
}
retval = armv8->dpm.instr_write_data_r0(&armv8->dpm, instr,
aarch64->system_control_reg_curr);
return retval; return retval;
} }
@ -714,51 +677,47 @@ static int aarch64_post_debug_entry(struct target *target)
struct aarch64_common *aarch64 = target_to_aarch64(target); struct aarch64_common *aarch64 = target_to_aarch64(target);
struct armv8_common *armv8 = &aarch64->armv8_common; struct armv8_common *armv8 = &aarch64->armv8_common;
int retval; int retval;
enum arm_mode target_mode = ARM_MODE_ANY;
uint32_t instr;
switch (armv8->arm.core_mode) { switch (armv8->arm.core_mode) {
case ARMV8_64_EL0T: case ARMV8_64_EL0T:
armv8_dpm_modeswitch(&armv8->dpm, ARMV8_64_EL1H); target_mode = ARMV8_64_EL1H;
/* fall through */ /* fall through */
case ARMV8_64_EL1T: case ARMV8_64_EL1T:
case ARMV8_64_EL1H: case ARMV8_64_EL1H:
retval = armv8->arm.mrs(target, 3, /*op 0*/ instr = ARMV8_MRS(SYSTEM_SCTLR_EL1, 0);
0, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
&aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
case ARMV8_64_EL2T: case ARMV8_64_EL2T:
case ARMV8_64_EL2H: case ARMV8_64_EL2H:
retval = armv8->arm.mrs(target, 3, /*op 0*/ instr = ARMV8_MRS(SYSTEM_SCTLR_EL2, 0);
4, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
&aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
case ARMV8_64_EL3H: case ARMV8_64_EL3H:
case ARMV8_64_EL3T: case ARMV8_64_EL3T:
retval = armv8->arm.mrs(target, 3, /*op 0*/ instr = ARMV8_MRS(SYSTEM_SCTLR_EL3, 0);
6, 0, /* op1, op2 */
1, 0, /* CRn, CRm */
&aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
break; break;
case ARM_MODE_SVC: case ARM_MODE_SVC:
retval = armv8->arm.mrc(target, 15, 0, 0, 1, 0, &aarch64->system_control_reg); case ARM_MODE_ABT:
if (retval != ERROR_OK) case ARM_MODE_FIQ:
return retval; case ARM_MODE_IRQ:
break; instr = ARMV4_5_MRC(15, 0, 0, 1, 0, 0);
break;
default: default:
LOG_INFO("cannot read system control register in this mode"); LOG_INFO("cannot read system control register in this mode");
break; return ERROR_FAIL;
} }
armv8_dpm_modeswitch(&armv8->dpm, ARM_MODE_ANY); if (target_mode != ARM_MODE_ANY)
armv8_dpm_modeswitch(&armv8->dpm, target_mode);
retval = armv8->dpm.instr_read_data_r0(&armv8->dpm, instr, &aarch64->system_control_reg);
if (retval != ERROR_OK)
return retval;
if (target_mode != ARM_MODE_ANY)
armv8_dpm_modeswitch(&armv8->dpm, ARM_MODE_ANY);
LOG_DEBUG("System_register: %8.8" PRIx32, aarch64->system_control_reg); LOG_DEBUG("System_register: %8.8" PRIx32, aarch64->system_control_reg);
aarch64->system_control_reg_curr = aarch64->system_control_reg; aarch64->system_control_reg_curr = aarch64->system_control_reg;

4
src/target/armv8_opcodes.h
View File

@ -42,6 +42,10 @@
#define SYSTEM_ELR_EL2 0b1110001000000001 #define SYSTEM_ELR_EL2 0b1110001000000001
#define SYSTEM_ELR_EL3 0b1111001000000001 #define SYSTEM_ELR_EL3 0b1111001000000001
#define SYSTEM_SCTLR_EL1 0b1100000010000000
#define SYSTEM_SCTLR_EL2 0b1110000010000000
#define SYSTEM_SCTLR_EL3 0b1111000010000000
#define SYSTEM_FPCR 0b1101101000100000 #define SYSTEM_FPCR 0b1101101000100000
#define SYSTEM_FPSR 0b1101101000100001 #define SYSTEM_FPSR 0b1101101000100001
#define SYSTEM_DAIF 0b1101101000010001 #define SYSTEM_DAIF 0b1101101000010001