target/hppa: Clean up conversion from/to MMU index and privilege level
v2 cover target/hppa: Clean up conversion from/to MMU index and privilege level
From: Helge Deller <[email protected]>
Make the conversion between privilege level and QEMU MMU index consitent, and afterwards switch to MMU indices 11-15.
v2:
- no functional changes
- just typo fixes in commit messages
- branch rebased on v8.1.0 release
Helge Deller (5):
target/hppa: Add missing PL1 and PL2 privilege levels target/hppa: Add privilege to MMU index conversion helpers target/hppa: Do not use hardcoded value for tlb_flush_*() target/hppa: Use privilege helper in hppa_get_physical_address() target/hppa: Switch to use MMU indices 11-15
target/hppa/cpu.h | 19 +++++++++++++++---- target/hppa/helper.c | 2 +- target/hppa/mem_helper.c | 16 ++++++++-------- target/hppa/translate.c | 9 +++++---- 4 files changed, 29 insertions(+), 17 deletions(-)
Signature · 1 line
2.41.0
PATCH v2 1/5 target/hppa: Add missing PL1 and PL2 privilege levels
From: Helge Deller <[email protected]>
The hppa CPU has 4 privilege levels (0-3).
Mention the missing PL1 and PL2 levels, although the Linux kernel uses only 0 (KERNEL) and 3 (USER). Not sure about HP-UX.
--- target/hppa/cpu.h | 3 +++ 1 file changed, 3 insertions(+)
target/hppa/cpu.h +3 -0
@@ -31,8 +31,11 @@#define TCG_GUEST_DEFAULT_MO TCG_MO_ALL#define MMU_KERNEL_IDX 0 +#define MMU_PL1_IDX 1 +#define MMU_PL2_IDX 2#define MMU_USER_IDX 3#define MMU_PHYS_IDX 4 +#define TARGET_INSN_START_EXTRA_WORDS 1/* Hardware exceptions, interrupts, faults, and traps. */
Signature · 1 line
2.41.0
PATCH v2 2/5 target/hppa: Add privilege to MMU index conversion helpers
In reply to [email protected]From: Helge Deller <[email protected]>
Add two macros which convert privilege level to/from MMU index:
- PRIV_TO_MMU_IDX(priv)
returns the MMU index for the given privilege level
- MMU_IDX_TO_PRIV(mmu_idx)
returns the corresponding privilege level for this MMU index
The introduction of those macros make the code easier to read and will help to improve performance in follow-up patch.
--- target/hppa/cpu.h | 5 ++++- target/hppa/translate.c | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
target/hppa/cpu.h +4 -1
@@ -36,6 +36,9 @@#define MMU_USER_IDX 3#define MMU_PHYS_IDX 4 +#define PRIV_TO_MMU_IDX (priv) (priv) +#define MMU_IDX_TO_PRIV (mmu_idx) (mmu_idx) +#define TARGET_INSN_START_EXTRA_WORDS 1/* Hardware exceptions, interrupts, faults, and traps. */
@@ -236,7 +239,7 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)return MMU_USER_IDX ;#else if (env->psw & (ifetch ?PSW_C :PSW_D )) { -return env->iaoq_f &3 ; +return PRIV_TO_MMU_IDX (env->iaoq_f &3 ); }return MMU_PHYS_IDX ;/* mmu disabled */ #endif
target/hppa/translate.c +5 -4
@@ -4057,14 +4057,15 @@ static void hppa_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->tb_flags = ctx->base.tb->flags;#ifdef CONFIG_USER_ONLY - ctx->privilege =MMU_USER_IDX ; + ctx->privilege =MMU_IDX_TO_PRIV (MMU_USER_IDX ); ctx->mmu_idx =MMU_USER_IDX ; - ctx->iaoq_f = ctx->base.pc_first |MMU_USER_IDX ; - ctx->iaoq_b = ctx->base.tb->cs_base |MMU_USER_IDX ; + ctx->iaoq_f = ctx->base.pc_first | ctx->privilege; + ctx->iaoq_b = ctx->base.tb->cs_base | ctx->privilege; ctx->unalign = (ctx->tb_flags &TB_FLAG_UNALIGN ?MO_UNALN :MO_ALIGN );#else ctx->privilege = (ctx->tb_flags >>TB_FLAG_PRIV_SHIFT ) &3 ; - ctx->mmu_idx = (ctx->tb_flags &PSW_D ? ctx->privilege :MMU_PHYS_IDX ); + ctx->mmu_idx = (ctx->tb_flags &PSW_D ? +PRIV_TO_MMU_IDX (ctx->privilege) :MMU_PHYS_IDX );/* Recover the IAOQ values from the GVA + PRIV. */ uint64_t cs_base = ctx->base.tb->cs_base;
Signature · 1 line
2.41.0
PATCH v2 3/5 target/hppa: Do not use hardcoded value for tlb_flush_*()
In reply to [email protected]From: Helge Deller <[email protected]>
Avoid using hardcoded values when calling the tlb_flush*() functions. Instead define the correct mask (HPPA_MMU_FLUSH_MASK) and use it. Skip flushing the MMU for physical addresses.
--- target/hppa/cpu.h | 5 +++++ target/hppa/helper.c | 2 +- target/hppa/mem_helper.c | 7 +++---- 3 files changed, 9 insertions(+), 5 deletions(-)
target/hppa/cpu.h +5 -0
@@ -41,6 +41,11 @@#define TARGET_INSN_START_EXTRA_WORDS 1 +/* No need to flush MMU_PHYS_IDX */ +#define HPPA_MMU_FLUSH_MASK \ + (1 << MMU_KERNEL_IDX | 1 << MMU_PL1_IDX | \ + 1 << MMU_PL2_IDX | 1 << MMU_USER_IDX) +/* Hardware exceptions, interrupts, faults, and traps. */ #define EXCP_HPMC 1/* high priority machine check */ #define EXCP_POWER_FAIL 2
target/hppa/helper.c +1 -1
@@ -71,7 +71,7 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg psw)/* If PSW_P changes, it affects how we translate addresses. */ if ((psw ^ old_psw) &PSW_P ) {#ifndef CONFIG_USER_ONLY -tlb_flush_by_mmuidx (env_cpu (env),0xf ); +tlb_flush_by_mmuidx (env_cpu (env),HPPA_MMU_FLUSH_MASK );#endif } }
target/hppa/mem_helper.c +3 -4
@@ -50,8 +50,7 @@ static void hppa_flush_tlb_ent(CPUHPPAState *env, hppa_tlb_entry *ent)trace_hppa_tlb_flush_ent (env, ent, ent->va_b, ent->va_e, ent->pa);for (i =0 ; i < n; ++i, addr +=TARGET_PAGE_SIZE ) { -/* Do not flush MMU_PHYS_IDX. */ -tlb_flush_page_by_mmuidx (cs, addr,0xf ); +tlb_flush_page_by_mmuidx (cs, addr,HPPA_MMU_FLUSH_MASK ); }memset (ent,0 ,sizeof (*ent));
@@ -335,13 +334,13 @@ void HELPER(ptlbe)(CPUHPPAState *env) {trace_hppa_tlb_ptlbe (env);memset (env->tlb,0 ,sizeof (env->tlb)); -tlb_flush_by_mmuidx (env_cpu (env),0xf ); +tlb_flush_by_mmuidx (env_cpu (env),HPPA_MMU_FLUSH_MASK ); }void cpu_hppa_change_prot_id (CPUHPPAState *env) {if (env->psw &PSW_P ) { -tlb_flush_by_mmuidx (env_cpu (env),0xf ); +tlb_flush_by_mmuidx (env_cpu (env),HPPA_MMU_FLUSH_MASK ); } }
Signature · 1 line
2.41.0
PATCH v2 4/5 target/hppa: Use privilege helper in hppa_get_physical_address()
In reply to [email protected]From: Helge Deller <[email protected]>
Convert hppa_get_physical_address() to use the privilege helper macro.
--- target/hppa/mem_helper.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
target/hppa/mem_helper.c +5 -4
@@ -73,7 +73,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot) { hwaddr phys; -int prot, r_prot, w_prot, x_prot; +int prot, r_prot, w_prot, x_prot, priv;hppa_tlb_entry *ent;int ret =-1 ;
@@ -97,9 +97,10 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, phys = ent->pa + (addr & ~TARGET_PAGE_MASK );/* Map TLB access_rights field to QEMU protection. */ - r_prot = (mmu_idx <= ent->ar_pl1) *PAGE_READ ; - w_prot = (mmu_idx <= ent->ar_pl2) *PAGE_WRITE ; - x_prot = (ent->ar_pl2 <= mmu_idx && mmu_idx <= ent->ar_pl1) *PAGE_EXEC ; + priv =MMU_IDX_TO_PRIV (mmu_idx); + r_prot = (priv <= ent->ar_pl1) *PAGE_READ ; + w_prot = (priv <= ent->ar_pl2) *PAGE_WRITE ; + x_prot = (ent->ar_pl2 <= priv && priv <= ent->ar_pl1) *PAGE_EXEC ;switch (ent->ar_type) {case 0 :/* read-only: data page */ prot = r_prot;
Signature · 1 line
2.41.0
PATCH v2 5/5 target/hppa: Switch to use MMU indices 11-15
In reply to [email protected]From: Helge Deller <[email protected]>
The MMU indices 9-15 will use shorter assembler instructions when run on a x86-64 host. So, switch over to those to get smaller code and maybe minimally faster emulation.
--- target/hppa/cpu.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
target/hppa/cpu.h +8 -8
@@ -30,14 +30,14 @@basis. It's probably easier to fall back to a strong memory model. */ #define TCG_GUEST_DEFAULT_MO TCG_MO_ALL -#define MMU_KERNEL_IDX 0 -#define MMU_PL1_IDX 1 -#define MMU_PL2_IDX 2 -#define MMU_USER_IDX 3 -#define MMU_PHYS_IDX 4 - -#define PRIV_TO_MMU_IDX (priv) (priv) -#define MMU_IDX_TO_PRIV (mmu_idx) (mmu_idx) +#define MMU_KERNEL_IDX 11 +#define MMU_PL1_IDX 12 +#define MMU_PL2_IDX 13 +#define MMU_USER_IDX 14 +#define MMU_PHYS_IDX 15 + +#define PRIV_TO_MMU_IDX (priv) (MMU_KERNEL_IDX + (priv)) +#define MMU_IDX_TO_PRIV (mmu_idx) ((mmu_idx) - MMU_KERNEL_IDX)#define TARGET_INSN_START_EXTRA_WORDS 1
Signature · 1 line
2.41.0