Unverified Commit c5969a3a authored by Rajnesh Kanwal's avatar Rajnesh Kanwal Committed by Palmer Dabbelt
Browse files

target/riscv: Fix VS mode interrupts forwarding. 



Currently riscv_cpu_local_irq_pending is used to find out pending
interrupt and VS mode interrupts are being shifted to represent
S mode interrupts in this function. So when the cause returned by
this function is passed to riscv_cpu_do_interrupt to actually
forward the interrupt, the VS mode forwarding check does not work
as intended and interrupt is actually forwarded to hypervisor. This
patch fixes this issue.

Signed-off-by: default avatarRajnesh Kanwal <rajnesh.kanwal49@gmail.com>
Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent c6fc0fc1

target/riscv/cpu_helper.c

+8 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *env) 
    target_ulong pending = env->mip & env->mie &

                               ~(MIP_VSSIP | MIP_VSTIP | MIP_VSEIP);

    target_ulong vspending = (env->mip & env->mie &

                              (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP)) >> 1;

                              (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP));



    target_ulong mie    = env->priv < PRV_M ||

                          (env->priv == PRV_M && mstatus_mie);
@@ -907,6 +907,13 @@ void riscv_cpu_do_interrupt(CPUState *cs) 


            if (riscv_cpu_virt_enabled(env) && ((hdeleg >> cause) & 1) &&

                !force_hs_execp) {

                /*

                 * See if we need to adjust cause. Yes if its VS mode interrupt

                 * no if hypervisor has delegated one of hs mode's interrupt

                 */

                if (cause == IRQ_VS_TIMER || cause == IRQ_VS_SOFT ||

                    cause == IRQ_VS_EXT)

                    cause = cause - 1;

                /* Trap to VS mode */

            } else if (riscv_cpu_virt_enabled(env)) {

                /* Trap into HS mode, from virt */