|
From: | Cédric Le Goater |
Subject: | Re: [Qemu-ppc] [PATCH v4 4/5] target/ppc: add hash MMU support for PowerNV POWER9 machines |
Date: | Tue, 24 Apr 2018 14:41:47 +0200 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 |
On 04/24/2018 02:03 PM, Cédric Le Goater wrote: >> +hwaddr ppc_hash64_hpt_reg(PowerPCCPU *cpu) >> +{ >> + CPUPPCState *env = &cpu->env; >> + >> + /* We should not reach this routine on sPAPR machines */ >> + assert(!cpu->vhyp); >> + >> + /* PowerNV machine */ >> + if (msr_hv) { >> + if (env->mmu_model & POWERPC_MMU_3_00) { >> + return ppc64_v3_get_patbe0(cpu); >> + } else { >> + return cpu->env.spr[SPR_SDR1]; >> + } >> + } else { >> + error_report("PowerNV guest support Unimplemented"); >> + exit(1); > > I just noticed that this breaks 970 CPUs ... How about ? if (env->mmu_model < POWERPC_MMU_2_07) { return cpu->env.spr[SPR_SDR1]; } /* P8/P9 PowerNV machine */ if (msr_hv) { if (env->mmu_model == POWERPC_MMU_3_00) { return ppc64_v3_get_patbe0(cpu); } else { return cpu->env.spr[SPR_SDR1]; } } else { error_report("PowerNV guest support Unimplemented"); exit(1); } and I have to fix all the : env->mmu_model & POWERPC_MMU_3_00 by : env->mmu_model == POWERPC_MMU_3_00 I tripped over with the recent changes C.
[Prev in Thread] | Current Thread | [Next in Thread] |