On Sun, Jun 27, 2021 at 06:27:13PM +0200, BALATON Zoltan wrote: > Change the assert in ppc_store_sdr1() to allow vhyp to be set on CPUs > without HV bit. This allows using the vhyp interface for firmware > emulation on pegasos2. > > Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Kind of a hack, but a simple one, so applied to ppc-for-6.1.
> ---
> target/ppc/cpu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/ppc/cpu.c b/target/ppc/cpu.c
> index 19d67b5b07..a29299882a 100644
> --- a/target/ppc/cpu.c
> +++ b/target/ppc/cpu.c
> @@ -72,7 +72,7 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
> {
> PowerPCCPU *cpu = env_archcpu(env);
> qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value);
> - assert(!cpu->vhyp);
> + assert(!cpu->env.has_hv_mode || !cpu->vhyp);
> #if defined(TARGET_PPC64)
> if (mmu_is_64bit(env->mmu_model)) {
> target_ulong sdr_mask = SDR_64_HTABORG | SDR_64_HTABSIZE;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
