mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PowerPC 4xx software driven TLB fixes + debug traces.

Browse Source 
Add code provision for more MMU models support.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2683 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-04-16 09:21:46 +00:00
parent 0a032cbec6
commit c55e9aefa7
3 changed files with 163 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target-ppc/cpu.h
View File

@ -581,12 +581,12 @@ struct ppc6xx_tlb_t {
typedef struct ppcemb_tlb_t ppcemb_tlb_t; typedef struct ppcemb_tlb_t ppcemb_tlb_t;
struct ppcemb_tlb_t { struct ppcemb_tlb_t {
target_ulong RPN; target_phys_addr_t RPN;
target_ulong EPN; target_ulong EPN;
target_ulong PID; target_ulong PID;
int size; target_ulong size;
int prot; uint32_t prot;
int attr; /* Storage attributes */ uint32_t attr; /* Storage attributes */
}; };
union ppc_tlb_t { union ppc_tlb_t {
@ -765,10 +765,6 @@ struct CPUPPCState {
int id_tlbs; /* If 1, MMU has separated TLBs for instructions & data */ int id_tlbs; /* If 1, MMU has separated TLBs for instructions & data */
int nb_pids; /* Number of available PID registers */ int nb_pids; /* Number of available PID registers */
ppc_tlb_t *tlb; /* TLB is optional. Allocate them only if needed */ ppc_tlb_t *tlb; /* TLB is optional. Allocate them only if needed */
/* Callbacks for specific checks on some implementations */
int (*tlb_check_more)(CPUPPCState *env, ppc_tlb_t *tlb, int *prot,
target_ulong vaddr, int rw, int acc_type,
int is_user);
/* 403 dedicated access protection registers */ /* 403 dedicated access protection registers */
target_ulong pb[4]; target_ulong pb[4];

138
target-ppc/helper.c
View File

@ -657,7 +657,8 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
target_ulong mask; target_ulong mask;
int i, ret, zsel, zpr; int i, ret, zsel, zpr;
ret = -6; ret = -1;
raddr = -1;
for (i = 0; i < env->nb_tlb; i++) { for (i = 0; i < env->nb_tlb; i++) {
tlb = &env->tlb[i].tlbe; tlb = &env->tlb[i].tlbe;
/* Check valid flag */ /* Check valid flag */
@ -691,8 +692,8 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
switch (zpr) { switch (zpr) {
case 0x0: case 0x0:
if (msr_pr) { if (msr_pr) {
ret = -3;
ctx->prot = 0; ctx->prot = 0;
ret = -3;
break; break;
} }
/* No break here */ /* No break here */
@ -702,25 +703,26 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
if (!(tlb->prot & PAGE_EXEC)) { if (!(tlb->prot & PAGE_EXEC)) {
ret = -3; ret = -3;
} else { } else {
if (tlb->prot & PAGE_WRITE) if (tlb->prot & PAGE_WRITE) {
ctx->prot = PAGE_READ | PAGE_WRITE; ctx->prot = PAGE_READ | PAGE_WRITE;
else } else {
ctx->prot = PAGE_READ; ctx->prot = PAGE_READ;
}
ret = 0; ret = 0;
} }
break; break;
case 0x3: case 0x3:
/* All accesses granted */ /* All accesses granted */
ret = 0;
ctx->prot = PAGE_READ | PAGE_WRITE; ctx->prot = PAGE_READ | PAGE_WRITE;
ret = 0;
break; break;
} }
} else { } else {
switch (zpr) { switch (zpr) {
case 0x0: case 0x0:
if (msr_pr) { if (msr_pr) {
ret = -2;
ctx->prot = 0; ctx->prot = 0;
ret = -2;
break; break;
} }
/* No break here */ /* No break here */
@ -728,20 +730,21 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
case 0x2: case 0x2:
/* Check from TLB entry */ /* Check from TLB entry */
/* Check write protection bit */ /* Check write protection bit */
if (rw && !(tlb->prot & PAGE_WRITE)) { if (tlb->prot & PAGE_WRITE) {
ret = -2; ctx->prot = PAGE_READ | PAGE_WRITE;
ret = 0;
} else { } else {
ret = 2; ctx->prot = PAGE_READ;
if (tlb->prot & PAGE_WRITE) if (rw)
ctx->prot = PAGE_READ | PAGE_WRITE; ret = -2;
else else
ctx->prot = PAGE_READ; ret = 0;
} }
break; break;
case 0x3: case 0x3:
/* All accesses granted */ /* All accesses granted */
ret = 2;
ctx->prot = PAGE_READ | PAGE_WRITE; ctx->prot = PAGE_READ | PAGE_WRITE;
ret = 0;
break; break;
} }
} }
@ -749,11 +752,17 @@ int mmu4xx_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
ctx->raddr = raddr; ctx->raddr = raddr;
if (loglevel) { if (loglevel) {
fprintf(logfile, "%s: access granted " ADDRX " => " REGX fprintf(logfile, "%s: access granted " ADDRX " => " REGX
" %d\n", __func__, address, ctx->raddr, ctx->prot); " %d %d\n", __func__, address, ctx->raddr, ctx->prot,
ret);
} }
return i; return 0;
} }
} }
if (loglevel) {
fprintf(logfile, "%s: access refused " ADDRX " => " REGX
" %d %d\n", __func__, address, raddr, ctx->prot,
ret);
}
return ret; return ret;
} }
@ -808,32 +817,49 @@ int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong eaddr,
/* No address translation */ /* No address translation */
ret = check_physical(env, ctx, eaddr, rw); ret = check_physical(env, ctx, eaddr, rw);
} else { } else {
ret = -1;
switch (PPC_MMU(env)) { switch (PPC_MMU(env)) {
case PPC_FLAGS_MMU_32B: case PPC_FLAGS_MMU_32B:
case PPC_FLAGS_MMU_SOFT_6xx: case PPC_FLAGS_MMU_SOFT_6xx:
/* Try to find a BAT */ /* Try to find a BAT */
ret = -1;
if (check_BATs) if (check_BATs)
ret = get_bat(env, ctx, eaddr, rw, access_type); ret = get_bat(env, ctx, eaddr, rw, access_type);
/* No break here */
#if defined(TARGET_PPC64)
case PPC_FLAGS_MMU_64B:
case PPC_FLAGS_MMU_64BRIDGE:
#endif
if (ret < 0) { if (ret < 0) {
/* We didn't match any BAT entry */ /* We didn't match any BAT entry or don't have BATs */
ret = get_segment(env, ctx, eaddr, rw, access_type); ret = get_segment(env, ctx, eaddr, rw, access_type);
} }
break; break;
case PPC_FLAGS_MMU_SOFT_4xx: case PPC_FLAGS_MMU_SOFT_4xx:
case PPC_FLAGS_MMU_403:
ret = mmu4xx_get_physical_address(env, ctx, eaddr, ret = mmu4xx_get_physical_address(env, ctx, eaddr,
rw, access_type); rw, access_type);
break; break;
default: case PPC_FLAGS_MMU_601:
/* XXX: TODO */ /* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n"); cpu_abort(env, "601 MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE:
/* XXX: TODO */
cpu_abort(env, "BookeE MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE_FSL:
/* XXX: TODO */
cpu_abort(env, "BookE FSL MMU model not implemented\n");
return -1;
default:
cpu_abort(env, "Unknown or invalid MMU model\n");
return -1; return -1;
} }
} }
#if 0 #if 0
if (loglevel > 0) { if (loglevel > 0) {
fprintf(logfile, "%s address " ADDRX " => " ADDRX "\n", fprintf(logfile, "%s address " ADDRX " => %d " ADDRX "\n",
__func__, eaddr, ctx->raddr); __func__, eaddr, ret, ctx->raddr);
} }
#endif #endif
@ -885,19 +911,48 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
switch (ret) { switch (ret) {
case -1: case -1:
/* No matches in page tables or TLB */ /* No matches in page tables or TLB */
if (unlikely(PPC_MMU(env) == PPC_FLAGS_MMU_SOFT_6xx)) { switch (PPC_MMU(env)) {
case PPC_FLAGS_MMU_SOFT_6xx:
exception = EXCP_I_TLBMISS; exception = EXCP_I_TLBMISS;
env->spr[SPR_IMISS] = address; env->spr[SPR_IMISS] = address;
env->spr[SPR_ICMP] = 0x80000000 | ctx.ptem; env->spr[SPR_ICMP] = 0x80000000 | ctx.ptem;
error_code = 1 << 18; error_code = 1 << 18;
goto tlb_miss; goto tlb_miss;
} else if (unlikely(PPC_MMU(env) == PPC_FLAGS_MMU_SOFT_4xx)) { case PPC_FLAGS_MMU_SOFT_4xx:
case PPC_FLAGS_MMU_403:
exception = EXCP_40x_ITLBMISS; exception = EXCP_40x_ITLBMISS;
error_code = 0; error_code = 0;
env->spr[SPR_40x_DEAR] = address; env->spr[SPR_40x_DEAR] = address;
env->spr[SPR_40x_ESR] = 0x00000000; env->spr[SPR_40x_ESR] = 0x00000000;
} else { break;
case PPC_FLAGS_MMU_32B:
error_code = 0x40000000; error_code = 0x40000000;
break;
#if defined(TARGET_PPC64)
case PPC_FLAGS_MMU_64B:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_64BRIDGE:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
#endif
case PPC_FLAGS_MMU_601:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE_FSL:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
default:
cpu_abort(env, "Unknown or invalid MMU model\n");
return -1;
} }
break; break;
case -2: case -2:
@ -924,7 +979,8 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
switch (ret) { switch (ret) {
case -1: case -1:
/* No matches in page tables or TLB */ /* No matches in page tables or TLB */
if (unlikely(PPC_MMU(env) == PPC_FLAGS_MMU_SOFT_6xx)) { switch (PPC_MMU(env)) {
case PPC_FLAGS_MMU_SOFT_6xx:
if (rw == 1) { if (rw == 1) {
exception = EXCP_DS_TLBMISS; exception = EXCP_DS_TLBMISS;
error_code = 1 << 16; error_code = 1 << 16;
@ -940,7 +996,8 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
env->spr[SPR_HASH2] = ctx.pg_addr[1]; env->spr[SPR_HASH2] = ctx.pg_addr[1];
/* Do not alter DAR nor DSISR */ /* Do not alter DAR nor DSISR */
goto out; goto out;
} else if (unlikely(PPC_MMU(env) == PPC_FLAGS_MMU_SOFT_4xx)) { case PPC_FLAGS_MMU_SOFT_4xx:
case PPC_FLAGS_MMU_403:
exception = EXCP_40x_DTLBMISS; exception = EXCP_40x_DTLBMISS;
error_code = 0; error_code = 0;
env->spr[SPR_40x_DEAR] = address; env->spr[SPR_40x_DEAR] = address;
@ -948,8 +1005,35 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
env->spr[SPR_40x_ESR] = 0x00800000; env->spr[SPR_40x_ESR] = 0x00800000;
else else
env->spr[SPR_40x_ESR] = 0x00000000; env->spr[SPR_40x_ESR] = 0x00000000;
} else { break;
case PPC_FLAGS_MMU_32B:
error_code = 0x40000000; error_code = 0x40000000;
break;
#if defined(TARGET_PPC64)
case PPC_FLAGS_MMU_64B:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_64BRIDGE:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
#endif
case PPC_FLAGS_MMU_601:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
case PPC_FLAGS_MMU_BOOKE_FSL:
/* XXX: TODO */
cpu_abort(env, "MMU model not implemented\n");
return -1;
default:
cpu_abort(env, "Unknown or invalid MMU model\n");
return -1;
} }
break; break;
case -2: case -2:

52
target-ppc/op_helper.c
View File

@ -2537,39 +2537,72 @@ void do_4xx_tlbsx_ (void)
env->crf[0] = tmp; env->crf[0] = tmp;
} }
void do_4xx_tlbwe_lo (void) void do_4xx_tlbwe_hi (void)
{ {
ppcemb_tlb_t *tlb; ppcemb_tlb_t *tlb;
target_ulong page, end; target_ulong page, end;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1);
}
#endif
T0 &= 0x3F; T0 &= 0x3F;
tlb = &env->tlb[T0].tlbe; tlb = &env->tlb[T0].tlbe;
/* Invalidate previous TLB (if it's valid) */ /* Invalidate previous TLB (if it's valid) */
if (tlb->prot & PAGE_VALID) { if (tlb->prot & PAGE_VALID) {
end = tlb->EPN + tlb->size; end = tlb->EPN + tlb->size;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s: invalidate old TLB %d start " ADDRX
" end " ADDRX "\n", __func__, (int)T0, tlb->EPN, end);
}
#endif
for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE) for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE)
tlb_flush_page(env, page); tlb_flush_page(env, page);
} }
tlb->size = booke_tlb_to_page_size((T1 >> 7) & 0x7); tlb->size = booke_tlb_to_page_size((T1 >> 7) & 0x7);
tlb->EPN = (T1 & 0xFFFFFC00) & ~(tlb->size - 1); tlb->EPN = (T1 & 0xFFFFFC00) & ~(tlb->size - 1);
if (T1 & 0x400) if (T1 & 0x40)
tlb->prot |= PAGE_VALID; tlb->prot |= PAGE_VALID;
else else
tlb->prot &= ~PAGE_VALID; tlb->prot &= ~PAGE_VALID;
tlb->PID = env->spr[SPR_BOOKE_PID]; /* PID */ tlb->PID = env->spr[SPR_40x_PID]; /* PID */
tlb->attr = T1 & 0xFF; tlb->attr = T1 & 0xFF;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s: set up TLB %d RPN " ADDRX " EPN " ADDRX
" size " ADDRX " prot %c%c%c%c PID %d\n", __func__,
(int)T0, tlb->RPN, tlb->EPN, tlb->size,
tlb->prot & PAGE_READ ? 'r' : '-',
tlb->prot & PAGE_WRITE ? 'w' : '-',
tlb->prot & PAGE_EXEC ? 'x' : '-',
tlb->prot & PAGE_VALID ? 'v' : '-', (int)tlb->PID);
}
#endif
/* Invalidate new TLB (if valid) */ /* Invalidate new TLB (if valid) */
if (tlb->prot & PAGE_VALID) { if (tlb->prot & PAGE_VALID) {
end = tlb->EPN + tlb->size; end = tlb->EPN + tlb->size;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s: invalidate TLB %d start " ADDRX
" end " ADDRX "\n", __func__, (int)T0, tlb->EPN, end);
}
#endif
for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE) for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE)
tlb_flush_page(env, page); tlb_flush_page(env, page);
} }
} }
void do_4xx_tlbwe_hi (void) void do_4xx_tlbwe_lo (void)
{ {
ppcemb_tlb_t *tlb; ppcemb_tlb_t *tlb;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1);
}
#endif
T0 &= 0x3F; T0 &= 0x3F;
tlb = &env->tlb[T0].tlbe; tlb = &env->tlb[T0].tlbe;
tlb->RPN = T1 & 0xFFFFFC00; tlb->RPN = T1 & 0xFFFFFC00;
@ -2578,5 +2611,16 @@ void do_4xx_tlbwe_hi (void)
tlb->prot |= PAGE_EXEC; tlb->prot |= PAGE_EXEC;
if (T1 & 0x100) if (T1 & 0x100)
tlb->prot |= PAGE_WRITE; tlb->prot |= PAGE_WRITE;
#if defined (DEBUG_SOFTWARE_TLB)
if (loglevel) {
fprintf(logfile, "%s: set up TLB %d RPN " ADDRX " EPN " ADDRX
" size " ADDRX " prot %c%c%c%c PID %d\n", __func__,
(int)T0, tlb->RPN, tlb->EPN, tlb->size,
tlb->prot & PAGE_READ ? 'r' : '-',
tlb->prot & PAGE_WRITE ? 'w' : '-',
tlb->prot & PAGE_EXEC ? 'x' : '-',
tlb->prot & PAGE_VALID ? 'v' : '-', (int)tlb->PID);
}
#endif
} }
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */