Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / arm / traps.c

diff --git a/hypervisor/arch/arm/traps.c b/hypervisor/arch/arm/traps.c
index 71246e934ef8d8c1e7d6f19903721871e731a693..ae0990f13749cf52bb017d5cdcda86a8ae833f45 100644 (file)
--- a/hypervisor/arch/arm/traps.c
+++ b/hypervisor/arch/arm/traps.c
@@ -209,7 +209,7 @@ static int arch_handle_smc(struct trap_context *ctx)
 {
        unsigned long *regs = ctx->regs;
 
-       if (IS_PSCI_FN(regs[0]))
+       if (IS_PSCI_32(regs[0]) || IS_PSCI_UBOOT(regs[0]))
                regs[0] = psci_dispatch(ctx);
        else
                regs[0] = smc(regs[0], regs[1], regs[2], regs[3]);
@@ -223,7 +223,7 @@ static int arch_handle_hvc(struct trap_context *ctx)
 {
        unsigned long *regs = ctx->regs;
 
-       if (IS_PSCI_FN(regs[0]))
+       if (IS_PSCI_32(regs[0]) || IS_PSCI_UBOOT(regs[0]))
                regs[0] = psci_dispatch(ctx);
        else
                regs[0] = hypercall(regs[0], regs[1], regs[2]);