Commit 042374c9 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/intc/arm_gicv3: Check correct HCR_EL2 bit when routing IRQ 



In icc_dir_write() we were incorrectly checking HCR_EL2.FMO
when determining whether IRQ should be routed to EL2; this should
be HCR_EL2.IMO (compare the GICv3 pseudocode ICC_DIR_EL1[]).
Use the correct mask.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20180723180337.17378-1-peter.maydell@linaro.org
parent 0c6c4395

hw/intc/arm_gicv3_cpuif.c

+1 −1
Original line number Diff line number Diff line
@@ -1550,7 +1550,7 @@ static void icc_dir_write(CPUARMState *env, const ARMCPRegInfo *ri, 
     * tested in cases where we know !IsSecure is true.

     */

    route_fiq_to_el2 = env->cp15.hcr_el2 & HCR_FMO;

    route_irq_to_el2 = env->cp15.hcr_el2 & HCR_FMO;

    route_irq_to_el2 = env->cp15.hcr_el2 & HCR_IMO;



    switch (arm_current_el(env)) {

    case 3: