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

target/ppc: Remove id_tlbs flag from CPU env

Browse Source 
This flag for split instruction/data TLBs is only set for 6xx soft TLB
MMU model and not used otherwise so no need to have a separate flag
for that.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
BALATON Zoltan 2024-05-13 01:28:02 +02:00 committed by Nicholas Piggin
parent 306b532030
commit 5fd257f599
6 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ppc/pegasos2.c
View File

@ -985,7 +985,7 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
cpu->env.icache_line_size); cpu->env.icache_line_size);
qemu_fdt_setprop_cell(fdt, cp, "i-cache-line-size", qemu_fdt_setprop_cell(fdt, cp, "i-cache-line-size",
cpu->env.icache_line_size); cpu->env.icache_line_size);
if (cpu->env.id_tlbs) { if (ppc_is_split_tlb(cpu)) {
qemu_fdt_setprop_cell(fdt, cp, "i-tlb-sets", cpu->env.nb_ways); qemu_fdt_setprop_cell(fdt, cp, "i-tlb-sets", cpu->env.nb_ways);
qemu_fdt_setprop_cell(fdt, cp, "i-tlb-size", cpu->env.tlb_per_way); qemu_fdt_setprop_cell(fdt, cp, "i-tlb-size", cpu->env.tlb_per_way);
qemu_fdt_setprop_cell(fdt, cp, "d-tlb-sets", cpu->env.nb_ways); qemu_fdt_setprop_cell(fdt, cp, "d-tlb-sets", cpu->env.nb_ways);

5
target/ppc/cpu.h
View File

@ -1281,7 +1281,6 @@ struct CPUArchState {
int tlb_per_way; /* Speed-up helper: used to avoid divisions at run time */ int tlb_per_way; /* Speed-up helper: used to avoid divisions at run time */
int nb_ways; /* Number of ways in the TLB set */ int nb_ways; /* Number of ways in the TLB set */
int last_way; /* Last used way used to allocate TLB in a LRU way */ int last_way; /* Last used way used to allocate TLB in a LRU way */
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 */
int tlb_type; /* Type of TLB we're dealing with */ int tlb_type; /* Type of TLB we're dealing with */
ppc_tlb_t tlb; /* TLB is optional. Allocate them only if needed */ ppc_tlb_t tlb; /* TLB is optional. Allocate them only if needed */
@ -2897,6 +2896,10 @@ static inline void booke206_fixed_size_tlbn(CPUPPCState *env, const int tlbn,
tlb->mas1 |= ((uint32_t)tsize) << MAS1_TSIZE_SHIFT; tlb->mas1 |= ((uint32_t)tsize) << MAS1_TSIZE_SHIFT;
} }
static inline bool ppc_is_split_tlb(PowerPCCPU *cpu)
{
return cpu->env.tlb_type == TLB_6XX;
}
#endif #endif
static inline bool msr_is_64bit(CPUPPCState *env, target_ulong msr) static inline bool msr_is_64bit(CPUPPCState *env, target_ulong msr)

19
target/ppc/cpu_init.c
View File

@ -2137,7 +2137,6 @@ static void init_proc_405(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = 64; env->nb_tlb = 64;
env->nb_ways = 1; env->nb_ways = 1;
env->id_tlbs = 0;
env->tlb_type = TLB_EMB; env->tlb_type = TLB_EMB;
#endif #endif
init_excp_4xx(env); init_excp_4xx(env);
@ -2211,7 +2210,6 @@ static void init_proc_440EP(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = 64; env->nb_tlb = 64;
env->nb_ways = 1; env->nb_ways = 1;
env->id_tlbs = 0;
env->tlb_type = TLB_EMB; env->tlb_type = TLB_EMB;
#endif #endif
init_excp_BookE(env); init_excp_BookE(env);
@ -2311,7 +2309,6 @@ static void init_proc_440GP(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = 64; env->nb_tlb = 64;
env->nb_ways = 1; env->nb_ways = 1;
env->id_tlbs = 0;
env->tlb_type = TLB_EMB; env->tlb_type = TLB_EMB;
#endif #endif
init_excp_BookE(env); init_excp_BookE(env);
@ -2386,7 +2383,6 @@ static void init_proc_440x5(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = 64; env->nb_tlb = 64;
env->nb_ways = 1; env->nb_ways = 1;
env->id_tlbs = 0;
env->tlb_type = TLB_EMB; env->tlb_type = TLB_EMB;
#endif #endif
init_excp_BookE(env); init_excp_BookE(env);
@ -2754,7 +2750,6 @@ static void init_proc_e200(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = 64; env->nb_tlb = 64;
env->nb_ways = 1; env->nb_ways = 1;
env->id_tlbs = 0;
env->tlb_type = TLB_EMB; env->tlb_type = TLB_EMB;
#endif #endif
init_excp_e200(env, 0xFFFF0000UL); init_excp_e200(env, 0xFFFF0000UL);
@ -2874,7 +2869,6 @@ static void init_proc_e500(CPUPPCState *env, int version)
/* Memory management */ /* Memory management */
env->nb_pids = 3; env->nb_pids = 3;
env->nb_ways = 2; env->nb_ways = 2;
env->id_tlbs = 0;
switch (version) { switch (version) {
case fsl_e500v1: case fsl_e500v1:
tlbncfg[0] = register_tlbncfg(2, 1, 1, 0, 256); tlbncfg[0] = register_tlbncfg(2, 1, 1, 0, 256);
@ -6927,20 +6921,17 @@ static void init_ppc_proc(PowerPCCPU *cpu)
} }
/* Allocate TLBs buffer when needed */ /* Allocate TLBs buffer when needed */
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
if (env->nb_tlb != 0) { if (env->nb_tlb) {
int nb_tlb = env->nb_tlb;
if (env->id_tlbs != 0) {
nb_tlb *= 2;
}
switch (env->tlb_type) { switch (env->tlb_type) {
case TLB_6XX: case TLB_6XX:
env->tlb.tlb6 = g_new0(ppc6xx_tlb_t, nb_tlb); /* 6xx has separate TLBs for instructions and data hence times 2 */
env->tlb.tlb6 = g_new0(ppc6xx_tlb_t, 2 * env->nb_tlb);
break; break;
case TLB_EMB: case TLB_EMB:
env->tlb.tlbe = g_new0(ppcemb_tlb_t, nb_tlb); env->tlb.tlbe = g_new0(ppcemb_tlb_t, env->nb_tlb);
break; break;
case TLB_MAS: case TLB_MAS:
env->tlb.tlbm = g_new0(ppcmas_tlb_t, nb_tlb); env->tlb.tlbm = g_new0(ppcmas_tlb_t, env->nb_tlb);
break; break;
} }
/* Pre-compute some useful values */ /* Pre-compute some useful values */

1
target/ppc/helper_regs.c
View File

@ -730,7 +730,6 @@ void register_6xx_7xx_soft_tlb(CPUPPCState *env, int nb_tlbs, int nb_ways)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nb_tlb = nb_tlbs; env->nb_tlb = nb_tlbs;
env->nb_ways = nb_ways; env->nb_ways = nb_ways;
env->id_tlbs = 1;
env->tlb_type = TLB_6XX; env->tlb_type = TLB_6XX;
spr_register(env, SPR_DMISS, "DMISS", spr_register(env, SPR_DMISS, "DMISS",
SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,

10
target/ppc/mmu_common.c
View File

@ -128,8 +128,8 @@ int ppc6xx_tlb_getnum(CPUPPCState *env, target_ulong eaddr,
nr = (eaddr >> TARGET_PAGE_BITS) & (env->tlb_per_way - 1); nr = (eaddr >> TARGET_PAGE_BITS) & (env->tlb_per_way - 1);
/* Select TLB way */ /* Select TLB way */
nr += env->tlb_per_way * way; nr += env->tlb_per_way * way;
/* 6xx have separate TLBs for instructions and data */ /* 6xx has separate TLBs for instructions and data */
if (is_code && env->id_tlbs == 1) { if (is_code) {
nr += env->nb_tlb; nr += env->nb_tlb;
} }
@ -1065,13 +1065,7 @@ static void mmu6xx_dump_mmu(CPUPPCState *env)
mmu6xx_dump_BATs(env, ACCESS_INT); mmu6xx_dump_BATs(env, ACCESS_INT);
mmu6xx_dump_BATs(env, ACCESS_CODE); mmu6xx_dump_BATs(env, ACCESS_CODE);
if (env->id_tlbs != 1) {
qemu_printf("ERROR: 6xx MMU should have separated TLB"
" for code and data\n");
}
qemu_printf("\nTLBs [EPN EPN + SIZE]\n"); qemu_printf("\nTLBs [EPN EPN + SIZE]\n");
for (type = 0; type < 2; type++) { for (type = 0; type < 2; type++) {
for (way = 0; way < env->nb_ways; way++) { for (way = 0; way < env->nb_ways; way++) {
for (entry = env->nb_tlb * type + env->tlb_per_way * way; for (entry = env->nb_tlb * type + env->tlb_per_way * way;

12
target/ppc/mmu_helper.c
View File

@ -45,14 +45,8 @@
static inline void ppc6xx_tlb_invalidate_all(CPUPPCState *env) static inline void ppc6xx_tlb_invalidate_all(CPUPPCState *env)
{ {
ppc6xx_tlb_t *tlb; ppc6xx_tlb_t *tlb;
int nr, max; int nr, max = 2 * env->nb_tlb;
/* LOG_SWTLB("Invalidate all TLBs\n"); */
/* Invalidate all defined software TLB */
max = env->nb_tlb;
if (env->id_tlbs == 1) {
max *= 2;
}
for (nr = 0; nr < max; nr++) { for (nr = 0; nr < max; nr++) {
tlb = &env->tlb.tlb6[nr]; tlb = &env->tlb.tlb6[nr];
pte_invalidate(&tlb->pte0); pte_invalidate(&tlb->pte0);
@ -308,9 +302,7 @@ void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr)
switch (env->mmu_model) { switch (env->mmu_model) {
case POWERPC_MMU_SOFT_6xx: case POWERPC_MMU_SOFT_6xx:
ppc6xx_tlb_invalidate_virt(env, addr, 0); ppc6xx_tlb_invalidate_virt(env, addr, 0);
if (env->id_tlbs == 1) { ppc6xx_tlb_invalidate_virt(env, addr, 1);
ppc6xx_tlb_invalidate_virt(env, addr, 1);
}
break; break;
case POWERPC_MMU_32B: case POWERPC_MMU_32B:
/* /*