target-ppc: Disentangle get_physical_address() paths
Depending on the MSR state, for 64-bit hash MMUs, get_physical_address can either call check_physical (which has further tests for mmu type) or get_segment64. Similarly for 32-bit hash MMUs we can either call check_physucal or get_bat() and get_segment32(). This patch splits off the whole get_physical_addresss() path for hash MMUs into 32-bit and 64-bit versions, handling real mode correctly for such MMUs without going to check_physical and rechecking the mmu type. Correspondingly, the hash MMU specific paths in check_physical() are removed. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
44bc910794
commit
629bd516fd
|
@ -1137,6 +1137,8 @@ int pp_check(int key, int pp, int nx);
|
||||||
int check_prot(int prot, int rw, int access_type);
|
int check_prot(int prot, int rw, int access_type);
|
||||||
int pte_update_flags(mmu_ctx_t *ctx, target_ulong *pte1p, int ret, int rw);
|
int pte_update_flags(mmu_ctx_t *ctx, target_ulong *pte1p, int ret, int rw);
|
||||||
hwaddr get_pteg_offset(CPUPPCState *env, hwaddr hash, int pte_size);
|
hwaddr get_pteg_offset(CPUPPCState *env, hwaddr hash, int pte_size);
|
||||||
|
int get_bat(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
|
target_ulong virtual, int rw, int type);
|
||||||
#endif /* !defined(CONFIG_USER_ONLY) */
|
#endif /* !defined(CONFIG_USER_ONLY) */
|
||||||
void ppc_store_msr (CPUPPCState *env, target_ulong value);
|
void ppc_store_msr (CPUPPCState *env, target_ulong value);
|
||||||
|
|
||||||
|
|
|
@ -158,8 +158,8 @@ static int find_pte32(CPUPPCState *env, mmu_ctx_t *ctx, int h,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int get_segment32(CPUPPCState *env, mmu_ctx_t *ctx,
|
static int get_segment32(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
target_ulong eaddr, int rw, int type)
|
target_ulong eaddr, int rw, int type)
|
||||||
{
|
{
|
||||||
hwaddr hash;
|
hwaddr hash;
|
||||||
target_ulong vsid;
|
target_ulong vsid;
|
||||||
|
@ -302,3 +302,28 @@ int get_segment32(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ppc_hash32_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
|
target_ulong eaddr, int rw, int access_type)
|
||||||
|
{
|
||||||
|
bool real_mode = (access_type == ACCESS_CODE && msr_ir == 0)
|
||||||
|
|| (access_type != ACCESS_CODE && msr_dr == 0);
|
||||||
|
|
||||||
|
if (real_mode) {
|
||||||
|
ctx->raddr = eaddr;
|
||||||
|
ctx->prot = PAGE_READ | PAGE_EXEC | PAGE_WRITE;
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
/* Try to find a BAT */
|
||||||
|
if (env->nb_BATs != 0) {
|
||||||
|
ret = get_bat(env, ctx, eaddr, rw, access_type);
|
||||||
|
}
|
||||||
|
if (ret < 0) {
|
||||||
|
/* We didn't match any BAT entry or don't have BATs */
|
||||||
|
ret = get_segment32(env, ctx, eaddr, rw, access_type);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
|
||||||
int pte32_is_valid(target_ulong pte0);
|
int pte32_is_valid(target_ulong pte0);
|
||||||
int get_segment32(CPUPPCState *env, mmu_ctx_t *ctx,
|
int ppc_hash32_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
target_ulong eaddr, int rw, int type);
|
target_ulong eaddr, int rw, int access_type);
|
||||||
|
|
||||||
#endif /* CONFIG_USER_ONLY */
|
#endif /* CONFIG_USER_ONLY */
|
||||||
|
|
||||||
|
|
|
@ -350,8 +350,8 @@ static int find_pte64(CPUPPCState *env, mmu_ctx_t *ctx, int h,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int get_segment64(CPUPPCState *env, mmu_ctx_t *ctx,
|
static int get_segment64(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
target_ulong eaddr, int rw, int type)
|
target_ulong eaddr, int rw, int type)
|
||||||
{
|
{
|
||||||
hwaddr hash;
|
hwaddr hash;
|
||||||
target_ulong vsid;
|
target_ulong vsid;
|
||||||
|
@ -435,3 +435,18 @@ int get_segment64(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ppc_hash64_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
|
target_ulong eaddr, int rw, int access_type)
|
||||||
|
{
|
||||||
|
bool real_mode = (access_type == ACCESS_CODE && msr_ir == 0)
|
||||||
|
|| (access_type != ACCESS_CODE && msr_dr == 0);
|
||||||
|
|
||||||
|
if (real_mode) {
|
||||||
|
ctx->raddr = eaddr & 0x0FFFFFFFFFFFFFFFULL;
|
||||||
|
ctx->prot = PAGE_READ | PAGE_EXEC | PAGE_WRITE;
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
return get_segment64(env, ctx, eaddr, rw, access_type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
#ifdef TARGET_PPC64
|
#ifdef TARGET_PPC64
|
||||||
void dump_slb(FILE *f, fprintf_function cpu_fprintf, CPUPPCState *env);
|
void dump_slb(FILE *f, fprintf_function cpu_fprintf, CPUPPCState *env);
|
||||||
int ppc_store_slb (CPUPPCState *env, target_ulong rb, target_ulong rs);
|
int ppc_store_slb (CPUPPCState *env, target_ulong rb, target_ulong rs);
|
||||||
int get_segment64(CPUPPCState *env, mmu_ctx_t *ctx,
|
int ppc_hash64_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
target_ulong eaddr, int rw, int type);
|
target_ulong eaddr, int rw, int access_type);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* CONFIG_USER_ONLY */
|
#endif /* CONFIG_USER_ONLY */
|
||||||
|
|
|
@ -426,8 +426,8 @@ static inline void bat_601_size_prot(CPUPPCState *env, target_ulong *blp,
|
||||||
*protp = prot;
|
*protp = prot;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int get_bat(CPUPPCState *env, mmu_ctx_t *ctx,
|
int get_bat(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
target_ulong virtual, int rw, int type)
|
target_ulong virtual, int rw, int type)
|
||||||
{
|
{
|
||||||
target_ulong *BATlt, *BATut, *BATu, *BATl;
|
target_ulong *BATlt, *BATut, *BATu, *BATl;
|
||||||
target_ulong BEPIl, BEPIu, bl;
|
target_ulong BEPIl, BEPIu, bl;
|
||||||
|
@ -1256,8 +1256,6 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
ctx->prot = PAGE_READ | PAGE_EXEC;
|
ctx->prot = PAGE_READ | PAGE_EXEC;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
switch (env->mmu_model) {
|
switch (env->mmu_model) {
|
||||||
case POWERPC_MMU_32B:
|
|
||||||
case POWERPC_MMU_601:
|
|
||||||
case POWERPC_MMU_SOFT_6xx:
|
case POWERPC_MMU_SOFT_6xx:
|
||||||
case POWERPC_MMU_SOFT_74xx:
|
case POWERPC_MMU_SOFT_74xx:
|
||||||
case POWERPC_MMU_SOFT_4xx:
|
case POWERPC_MMU_SOFT_4xx:
|
||||||
|
@ -1265,15 +1263,7 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
case POWERPC_MMU_BOOKE:
|
case POWERPC_MMU_BOOKE:
|
||||||
ctx->prot |= PAGE_WRITE;
|
ctx->prot |= PAGE_WRITE;
|
||||||
break;
|
break;
|
||||||
#if defined(TARGET_PPC64)
|
|
||||||
case POWERPC_MMU_64B:
|
|
||||||
case POWERPC_MMU_2_06:
|
|
||||||
case POWERPC_MMU_2_06d:
|
|
||||||
/* Real address are 60 bits long */
|
|
||||||
ctx->raddr &= 0x0FFFFFFFFFFFFFFFULL;
|
|
||||||
ctx->prot |= PAGE_WRITE;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case POWERPC_MMU_SOFT_4xx_Z:
|
case POWERPC_MMU_SOFT_4xx_Z:
|
||||||
if (unlikely(msr_pe != 0)) {
|
if (unlikely(msr_pe != 0)) {
|
||||||
/* 403 family add some particular protections,
|
/* 403 family add some particular protections,
|
||||||
|
@ -1298,15 +1288,10 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case POWERPC_MMU_MPC8xx:
|
|
||||||
/* XXX: TODO */
|
|
||||||
cpu_abort(env, "MPC8xx MMU model is not implemented\n");
|
|
||||||
break;
|
|
||||||
case POWERPC_MMU_BOOKE206:
|
|
||||||
cpu_abort(env, "BookE 2.06 MMU doesn't have physical real mode\n");
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
cpu_abort(env, "Unknown or invalid MMU model\n");
|
/* Caller's checks mean we should never get here for other models */
|
||||||
|
abort();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1327,18 +1312,7 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
switch (env->mmu_model) {
|
switch (env->mmu_model) {
|
||||||
case POWERPC_MMU_32B:
|
case POWERPC_MMU_32B:
|
||||||
case POWERPC_MMU_601:
|
case POWERPC_MMU_601:
|
||||||
if (real_mode) {
|
ret = ppc_hash32_get_physical_address(env, ctx, eaddr, rw, access_type);
|
||||||
ret = check_physical(env, ctx, eaddr, rw);
|
|
||||||
} else {
|
|
||||||
/* Try to find a BAT */
|
|
||||||
if (env->nb_BATs != 0) {
|
|
||||||
ret = get_bat(env, ctx, eaddr, rw, access_type);
|
|
||||||
}
|
|
||||||
if (ret < 0) {
|
|
||||||
/* We didn't match any BAT entry or don't have BATs */
|
|
||||||
ret = get_segment32(env, ctx, eaddr, rw, access_type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POWERPC_MMU_SOFT_6xx:
|
case POWERPC_MMU_SOFT_6xx:
|
||||||
|
@ -1361,11 +1335,7 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||||
case POWERPC_MMU_64B:
|
case POWERPC_MMU_64B:
|
||||||
case POWERPC_MMU_2_06:
|
case POWERPC_MMU_2_06:
|
||||||
case POWERPC_MMU_2_06d:
|
case POWERPC_MMU_2_06d:
|
||||||
if (real_mode) {
|
ret = ppc_hash64_get_physical_address(env, ctx, eaddr, rw, access_type);
|
||||||
ret = check_physical(env, ctx, eaddr, rw);
|
|
||||||
} else {
|
|
||||||
ret = get_segment64(env, ctx, eaddr, rw, access_type);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue