On 10/01/2016 05:05 AM, Artyom Tarasenko wrote:
Signed-off-by: Artyom Tarasenko <atar4q...@gmail.com> --- target-sparc/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 0b5c79f..fbeb8d7 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -699,10 +699,10 @@ static inline int cpu_mmu_index(CPUSPARCState *env1, bool ifetch) #elif !defined(TARGET_SPARC64) return env1->psrs; #else - if (env1->tl > 0) { - return MMU_NUCLEUS_IDX; - } else if (cpu_hypervisor_mode(env1)) { + if (cpu_hypervisor_mode(env1)) { return MMU_HYPV_IDX; + } else if (env1->tl > 0) { + return MMU_NUCLEUS_IDX; } else if (cpu_supervisor_mode(env1)) { return MMU_KERNEL_IDX; } else {
While playing with your patch set, I discovered that we also need a patch to get_asi for ASI_N et al to retain MMU_HYPV_IDX, and not decrease privilege. This happens *very* early in the prom boot, with the first casx (when casx is implemented inline).
r~
