Commit f208ec71 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

target/ppc: Introduce a relocation bool in ppc_radix64_handle_mmu_fault() 



It will ease the introduction of new routines for partition-scoped
Radix translation.

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-Id: <20200330094946.24678-3-clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 933abb9c

target/ppc/mmu-radix64.c

+3 −2
Original line number Diff line number Diff line
@@ -229,12 +229,13 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, 
    uint64_t lpid = 0, pid = 0, offset, size, prtbe0, pte;

    int page_size, prot, fault_cause = 0;

    ppc_v3_pate_t pate;

    bool relocation;



    assert((rwx == 0) || (rwx == 1) || (rwx == 2));



    relocation = ((rwx == 2) && (msr_ir == 1)) || ((rwx != 2) && (msr_dr == 1));

    /* HV or virtual hypervisor Real Mode Access */

    if ((msr_hv || cpu->vhyp) &&

        (((rwx == 2) && (msr_ir == 0)) || ((rwx != 2) && (msr_dr == 0)))) {

    if (!relocation && (msr_hv || cpu->vhyp)) {

        /* In real mode top 4 effective addr bits (mostly) ignored */

        raddr = eaddr & 0x0FFFFFFFFFFFFFFFULL;