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

target/ppc: Extend ppc_radix64_check_prot() with a 'partition_scoped' bool 



This prepares ground 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>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <20200403140056.59465-3-clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent d92baf00

target/ppc/mmu-radix64.c

+6 −5
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static void ppc_radix64_raise_si(PowerPCCPU *cpu, int rwx, vaddr eaddr, 




static bool ppc_radix64_check_prot(PowerPCCPU *cpu, int rwx, uint64_t pte,

                                   int *fault_cause, int *prot)

                                   int *fault_cause, int *prot,

                                   bool partition_scoped)

{

    CPUPPCState *env = &cpu->env;

    const int need_prot[] = { PAGE_READ, PAGE_WRITE, PAGE_EXEC };
@@ -121,11 +122,11 @@ static bool ppc_radix64_check_prot(PowerPCCPU *cpu, int rwx, uint64_t pte, 
    }



    /* Determine permissions allowed by Encoded Access Authority */

    if ((pte & R_PTE_EAA_PRIV) && msr_pr) { /* Insufficient Privilege */

    if (!partition_scoped && (pte & R_PTE_EAA_PRIV) && msr_pr) {

        *prot = 0;

    } else if (msr_pr || (pte & R_PTE_EAA_PRIV)) {

    } else if (msr_pr || (pte & R_PTE_EAA_PRIV) || partition_scoped) {

        *prot = ppc_radix64_get_prot_eaa(pte);

    } else { /* !msr_pr && !(pte & R_PTE_EAA_PRIV) */

    } else { /* !msr_pr && !(pte & R_PTE_EAA_PRIV) && !partition_scoped */

        *prot = ppc_radix64_get_prot_eaa(pte);

        *prot &= ppc_radix64_get_prot_amr(cpu); /* Least combined permissions */

    }
@@ -250,7 +251,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU *cpu, int rwx, 
                                g_raddr, g_page_size, &fault_cause, &pte_addr);



    if (!(pte & R_PTE_VALID) ||

        ppc_radix64_check_prot(cpu, rwx, pte, &fault_cause, g_prot)) {

        ppc_radix64_check_prot(cpu, rwx, pte, &fault_cause, g_prot, false)) {

        /* No valid pte or access denied due to protection */

        if (cause_excp) {

            ppc_radix64_raise_si(cpu, rwx, eaddr, fault_cause);