various aarch64 fixes for running Hyper-V on TCG
PATCH v2 2/2 target/arm: provide stubs for more external debug registers
In reply to Evgeny IakovlevQemu doesn't implement Debug Communication Channel, as well as the rest of external debug interface. However, Microsoft Hyper-V tries to access some of these registers during an EL2 context switch.
Since there is no architectural way to not advertise support for external debug, provide RAZ/WI stubs for OSDTRRX_EL1, OSDTRTX_EL1 and OSECCR_EL1 registers in the same way the rest of external debug is currently done.
--- target/arm/debug_helper.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
target/arm/debug_helper.c +21 -0
@@ -684,6 +684,27 @@ static const ARMCPRegInfo debug_cp_reginfo[] = { .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .access = PL0_R, .accessfn = access_tda, .type = ARM_CP_CONST, .resetvalue = 0 }, +/* +* OSDTRRX_EL1/OSDTRTX_EL1 are used for save and restore of DBGDTRRX_EL0. +* It is a component of the Debug Communications Channel, which is not implemented. +*/ + { .name = "OSDTRRX_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, + .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 0, .opc2 = 2, + .access = PL1_RW, .accessfn = access_tda, + .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "OSDTRTX_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, + .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 2, + .access = PL1_RW, .accessfn = access_tda, + .type = ARM_CP_CONST, .resetvalue = 0 }, + /* + * OSECCR_EL1 provides a mechanism for an operating system + * to access the contents of EDECCR. EDECCR is not implemented though, + * as is the rest of external device mechanism. + */ + { .name = "OSECCR_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, + .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 6, .opc2 = 2, + .access = PL1_RW, .accessfn = access_tda, + .type = ARM_CP_CONST, .resetvalue = 0 },/* * DBGDSCRint[15,12,5:2] map to MDSCR_EL1[15,12,5:2]. Map all bits as * it is unlikely a guest will care.
Signature · 1 line
2.34.1
PATCH v2 1/2 target/arm: implement DBGCLAIM registers
In reply to Evgeny IakovlevThe architecture does not define any functionality for the CLAIM tag bits. So we will just keep the raw bits, as per spec.
--- target/arm/cpu.h | 1 + target/arm/debug_helper.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)
target/arm/cpu.h +1 -0
@@ -494,6 +494,7 @@ typedef struct CPUArchState {uint64_t dbgbcr[16 ];/* breakpoint control registers */ uint64_t dbgwvr[16 ];/* watchpoint value registers */ uint64_t dbgwcr[16 ];/* watchpoint control registers */ +uint64_t dbgclaim;/* DBGCLAIM bits */ uint64_t mdscr_el1;uint64_t oslsr_el1;/* OS Lock Status */ uint64_t osdlr_el1;/* OS DoubleLock status */
target/arm/debug_helper.c +38 -0
@@ -629,6 +629,29 @@ static void osdlr_write(CPUARMState *env, const ARMCPRegInfo *ri, } } +static void dbgclaimset_write (CPUARMState *env,const ARMCPRegInfo *ri, +uint64_t value) +{ + env->cp15.dbgclaim |= (value &0xFF ); +} + +static uint64_t dbgclaimset_read (CPUARMState *env,const ARMCPRegInfo *ri) +{ +/* CLAIM bits are RAO */ +return 0xFF ; +} + +static void dbgclaimclr_write (CPUARMState *env,const ARMCPRegInfo *ri, +uint64_t value) +{ + env->cp15.dbgclaim &= ~(value &0xFF ); +} + +static void dbgclaimclr_raw_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) +{ + env->cp15.dbgclaim = value; +} +static const ARMCPRegInfo debug_cp_reginfo[] = {/* * DBGDRAR, DBGDSAR: always RAZ since we don't implement memory mapped
@@ -712,6 +735,21 @@ static const ARMCPRegInfo debug_cp_reginfo[] = { .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 0, .access = PL1_RW, .accessfn = access_tda, .type = ARM_CP_NOP }, +/* +* Dummy DBGCLAIM registers. +* "The architecture does not define any functionality for the CLAIM tag bits.", +* so we only keep the raw bits +*/ + { .name = "DBGCLAIMSET_EL1", .state = ARM_CP_STATE_BOTH, + .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 7, .crm = 8, .opc2 = 6, + .type = ARM_CP_ALIAS, + .access = PL1_RW, .accessfn = access_tda, + .writefn = dbgclaimset_write, .readfn = dbgclaimset_read }, + { .name = "DBGCLAIMCLR_EL1", .state = ARM_CP_STATE_BOTH, + .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 7, .crm = 9, .opc2 = 6, + .access = PL1_RW, .accessfn = access_tda, + .writefn = dbgclaimclr_write, .raw_writefn = dbgclaimclr_raw_write, + .fieldoffset = offsetof(CPUARMState, cp15.dbgclaim) }, }; static const ARMCPRegInfo debug_lpae_cp_reginfo[] = {
Signature · 1 line
2.34.1
v2 cover various aarch64 fixes for running Hyper-V on TCG
Small series of changes to aarch64 emulation to better support running Hyper-V as a TCG guest wtih EL3 firmware.
v2:
* DBGCLAIM now implements a (trivial) raw_write handler
* Added comments around ignored external debug registers
* Patch 3 is dropped because it was manually picked into target-arm.next
Evgeny Iakovlev (2):
target/arm: implement DBGCLAIM registers target/arm: provide stubs for more external debug registers
target/arm/cpu.h | 1 + target/arm/debug_helper.c | 59 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+)
Signature · 1 line
2.34.1
Re: [PATCH v2 1/2] target/arm: implement DBGCLAIM registers
In reply to Evgeny Iakovlevtarget/arm/debug_helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 752
Quoted 5 lines · Evgeny Iakovlev
target/arm/debug_helper.c +5
-0+ { .name = "DBGCLAIMCLR_EL1", .state = ARM_CP_STATE_BOTH, + .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 7, .crm = 9, .opc2 = 6, + .access = PL1_RW, .accessfn = access_tda, + .writefn = dbgclaimclr_write, .raw_writefn = dbgclaimclr_raw_write, + .fieldoffset = offsetof(CPUARMState, cp15.dbgclaim) },
You didn't need a new function, just .raw_writefn = raw_write (which then uses .fieldoffset to dtrt).
Otherwise,
r~
Re: [PATCH v2 1/2] target/arm: implement DBGCLAIM registers
Quoted 10 lines · Richard Henderson
Quoted 6 lines · Evgeny Iakovlev
+ { .name = "
DBGCLAIMCLR_EL1", .state =ARM_CP_STATE_BOTH, + .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 7, .crm = 9, .opc2 = 6, + .access =PL1_RW, .accessfn =access_tda,
+ .writefn =dbgclaimclr_write, .raw_writefn =dbgclaimclr_raw_write,
+ .fieldoffset =offsetof(CPUARMState, cp15.dbgclaim)},You didn't need a new function, just .raw_writefn =
raw_write(which then uses .fieldoffset to dtrt).
Ah, i see, okay.
Quoted 6 lines
Otherwise,
Reviewed-by Richard Henderson <[email protected]>r~