| Message ID | 20210708164957.28096-2-lucas.araujo@eldorado.org.br (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: MMU clean up | expand |
On Thu, Jul 08, 2021 at 01:49:54PM -0300, Lucas Mateus Castro (alqotel) wrote: > The function ppc_tlb_invalid_all is not compiled anymore in a TCG-less > environment, and the call to that function has been disabled in this > situation > > Signed-off-by: Lucas Mateus Castro (alqotel) > <lucas.araujo@eldorado.org.br> Applied to ppc-for-6.1, thanks. > --- > target/ppc/cpu_init.c | 2 ++ > target/ppc/mmu_helper.c | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index 6f8ce010ba..505a0ed6ac 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -8847,9 +8847,11 @@ static void ppc_cpu_reset(DeviceState *dev) > > #if !defined(CONFIG_USER_ONLY) > env->nip = env->hreset_vector | env->excp_prefix; > +#if defined(CONFIG_TCG) > if (env->mmu_model != POWERPC_MMU_REAL) { > ppc_tlb_invalidate_all(env); > } > +#endif /* CONFIG_TCG */ > #endif > > hreg_compute_hflags(env); > diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c > index 47e9f9529e..869d24d301 100644 > --- a/target/ppc/mmu_helper.c > +++ b/target/ppc/mmu_helper.c > @@ -825,6 +825,7 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, > return ret; > } > > +#ifdef CONFIG_TCG > static void booke206_flush_tlb(CPUPPCState *env, int flags, > const int check_iprot) > { > @@ -846,6 +847,7 @@ static void booke206_flush_tlb(CPUPPCState *env, int flags, > > tlb_flush(env_cpu(env)); > } > +#endif > > static hwaddr booke206_tlb_to_page_size(CPUPPCState *env, > ppcmas_tlb_t *tlb) > @@ -1901,6 +1903,7 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value) > } > #endif > > +#ifdef CONFIG_TCG > /*****************************************************************************/ > /* TLB management */ > void ppc_tlb_invalidate_all(CPUPPCState *env) > @@ -1944,6 +1947,7 @@ void ppc_tlb_invalidate_all(CPUPPCState *env) > break; > } > } > +#endif > > #ifdef CONFIG_TCG > void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr)
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6f8ce010ba..505a0ed6ac 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -8847,9 +8847,11 @@ static void ppc_cpu_reset(DeviceState *dev) #if !defined(CONFIG_USER_ONLY) env->nip = env->hreset_vector | env->excp_prefix; +#if defined(CONFIG_TCG) if (env->mmu_model != POWERPC_MMU_REAL) { ppc_tlb_invalidate_all(env); } +#endif /* CONFIG_TCG */ #endif hreg_compute_hflags(env); diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 47e9f9529e..869d24d301 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -825,6 +825,7 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, return ret; } +#ifdef CONFIG_TCG static void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot) { @@ -846,6 +847,7 @@ static void booke206_flush_tlb(CPUPPCState *env, int flags, tlb_flush(env_cpu(env)); } +#endif static hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb) @@ -1901,6 +1903,7 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value) } #endif +#ifdef CONFIG_TCG /*****************************************************************************/ /* TLB management */ void ppc_tlb_invalidate_all(CPUPPCState *env) @@ -1944,6 +1947,7 @@ void ppc_tlb_invalidate_all(CPUPPCState *env) break; } } +#endif #ifdef CONFIG_TCG void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr)
The function ppc_tlb_invalid_all is not compiled anymore in a TCG-less environment, and the call to that function has been disabled in this situation Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br> --- target/ppc/cpu_init.c | 2 ++ target/ppc/mmu_helper.c | 4 ++++ 2 files changed, 6 insertions(+)