arm/monitor: Add support for 'info tlb' command
PATCH v2 1/1 arm/monitor: Add support for 'info tlb' command
This adds hmp 'info tlb' command support for the arm platform. The limitation is that this only implements a page walker for ARMv8-A AArch64 Long Descriptor format, 32bit addressing is not supported yet.
To reuse existing code, this patch also extracts some APIs from helper.c, including regime_translation_disabled(), pt_start_level_stage1(), regime_ttbr().
Signed-off-by Changbin Du <[email protected]>
---
v2:
o fix coding style
o extract common code pt_start_level_stage1()
Signed-off-by Changbin Du <[email protected]>
--- hmp-commands-info.hx | 3 +- target/arm/helper.c | 30 +------ target/arm/internals.h | 32 +++++++ target/arm/monitor.c | 183 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+), 29 deletions(-)
hmp-commands-info.hx +2 -1
@@ -222,7 +222,8 @@ SRST ERST #if defined(TARGET_I386) || defined(TARGET_SH4) || defined(TARGET_SPARC) || \ - defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) + defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) || \ + defined(TARGET_ARM) { .name = "tlb", .args_type = "",
target/arm/helper.c +2 -28
@@ -9974,8 +9974,7 @@ static inline uint64_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx)#ifndef CONFIG_USER_ONLY /* Return true if the specified stage of address translation is disabled */ -static inline bool regime_translation_disabled (CPUARMState *env, -ARMMMUIdx mmu_idx) +bool regime_translation_disabled (CPUARMState *env,ARMMMUIdx mmu_idx) {if (arm_feature (env,ARM_FEATURE_M )) { switch (env->v7m.mpu_ctrl[regime_is_secure(env, mmu_idx)] &
@@ -10021,20 +10020,6 @@ static inline bool regime_translation_big_endian(CPUARMState *env, return (regime_sctlr(env, mmu_idx) & SCTLR_EE) != 0; } -/* Return the TTBR associated with this translation regime */ -static inline uint64_t regime_ttbr (CPUARMState *env,ARMMMUIdx mmu_idx, -int ttbrn) -{ -if (mmu_idx == ARMMMUIdx_Stage2) { -return env->cp15.vttbr_el2; - } -if (ttbrn ==0 ) { -return env->cp15.ttbr0_el[regime_el (env, mmu_idx)]; - }else { -return env->cp15.ttbr1_el[regime_el (env, mmu_idx)]; - } -} -#endif /* !CONFIG_USER_ONLY */ /* Convert a possible stage1+2 MMU index into the appropriate
@@ -11077,18 +11062,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, }if (mmu_idx != ARMMMUIdx_Stage2) { -/* The starting level depends on the virtual address size (which can -* be up to 48 bits) and the translation granule size. It indicates -* the number of strides (stride bits at a time) needed to -* consume the bits of the input address. In the pseudocode this is: -* level = 4 - RoundUp((inputsize - grainsize) / stride) -* where their 'inputsize' is our 'inputsize', 'grainsize' is -* our 'stride + 3' and 'stride' is our 'stride'. -* Applying the usual "rounded up m/n is (m+n-1)/n" and simplifying: -* = 4 - (inputsize - stride - 3 + stride - 1) / stride -* = 4 - (inputsize - 4) / stride; -*/ - level =4 - (inputsize -4 ) / stride; + level =pt_start_level_stage1 (inputsize, stride); }else {/* For stage 2 translations the starting level is specified by the * VTCR_EL2.SL0 field (whose interpretation depends on the page size)
target/arm/internals.h +32 -0
@@ -949,6 +949,8 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) } } +bool regime_translation_disabled (CPUARMState *env,ARMMMUIdx mmu_idx); +/* Return the TCR controlling this translation regime */ static inline TCR *regime_tcr (CPUARMState *env,ARMMMUIdx mmu_idx) {
@@ -958,6 +960,20 @@ static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx)return &env->cp15.tcr_el[regime_el (env, mmu_idx)]; } +/* Return the TTBR associated with this translation regime */ +static inline uint64_t regime_ttbr (CPUARMState *env,ARMMMUIdx mmu_idx, +int ttbrn) +{ +if (mmu_idx == ARMMMUIdx_Stage2) { +return env->cp15.vttbr_el2; + } +if (ttbrn ==0 ) { +return env->cp15.ttbr0_el[regime_el (env, mmu_idx)]; + }else { +return env->cp15.ttbr1_el[regime_el (env, mmu_idx)]; + } +} +/* Return the FSR value for a debug exception (watchpoint, hardware * breakpoint or BKPT insn) targeting the specified exception level. */
@@ -1291,6 +1307,22 @@ typedef struct ARMCacheAttrs { unsigned int shareability:2; /* as in the SH field of the VMSAv8-64 PTEs */ } ARMCacheAttrs; +static inline int pt_start_level_stage1 (int inputsize,int stride) +{ +/* The starting level depends on the virtual address size (which can +* be up to 48 bits) and the translation granule size. It indicates +* the number of strides (stride bits at a time) needed to +* consume the bits of the input address. In the pseudocode this is: +* level = 4 - RoundUp((inputsize - grainsize) / stride) +* where their 'inputsize' is our 'inputsize', 'grainsize' is +* our 'stride + 3' and 'stride' is our 'stride'. +* Applying the usual "rounded up m/n is (m+n-1)/n" and simplifying: +* = 4 - (inputsize - stride - 3 + stride - 1) / stride +* = 4 - (inputsize - 4) / stride; +*/ +return 4 - (inputsize -4 ) / stride; +} + bool get_phys_addr(CPUARMState *env, target_ulong address, MMUAccessType access_type, ARMMMUIdx mmu_idx, hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot,
target/arm/monitor.c +183 -0
192 lines not on this page · raw message
Signature · 1 line
2.25.1