Commit 6eebe6dc authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by David Gibson
Browse files

target/ppc: Add support for LPCR:HEIC on POWER9 



This controls whether the External Interrupt (0x500) can be
delivered to the hypervisor or not.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Message-Id: <20190215161648.9600-11-clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 67afe775

target/ppc/excp_helper.c

+4 −1
Original line number Diff line number Diff line
@@ -827,7 +827,10 @@ static void ppc_hw_interrupt(CPUPPCState *env) 
    /* External interrupt can ignore MSR:EE under some circumstances */

    if (env->pending_interrupts & (1 << PPC_INTERRUPT_EXT)) {

        bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0);

        if (async_deliver || (env->has_hv_mode && msr_hv == 0 && !lpes0)) {

        bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC);

        /* HEIC blocks delivery to the hypervisor */

        if ((async_deliver && !(heic && msr_hv && !msr_pr)) ||

            (env->has_hv_mode && msr_hv == 0 && !lpes0)) {

            powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL);

            return;

        }

target/ppc/translate_init.inc.c

+4 −1
Original line number Diff line number Diff line
@@ -8823,8 +8823,11 @@ static bool cpu_has_work_POWER9(CPUState *cs) 
        /* External Exception */

        if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) &&

            (env->spr[SPR_LPCR] & LPCR_EEE)) {

            bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC);

            if (heic == 0 || !msr_hv || msr_pr) {

                return true;

            }

        }

        /* Decrementer Exception */

        if ((env->pending_interrupts & (1u << PPC_INTERRUPT_DECR)) &&

            (env->spr[SPR_LPCR] & LPCR_DEE)) {