diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c
index d1615be8a6..4ca1d7c48f 100644
--- a/xen/arch/arm/vpsci.c
+++ b/xen/arch/arm/vpsci.c
@@ -128,6 +128,8 @@ static register_t do_psci_0_2_cpu_suspend(uint32_t power_state,
      */
 
     vcpu_block_unless_event_pending(v);
+    v->arch.cpu_info->guest_cpu_user_regs.pc = (u64) entry_point;
+    v->arch.cpu_info->guest_cpu_user_regs.x0 = context_id;
     return PSCI_SUCCESS;
 }