Use FFA_INTERRUPT rather than custom HF_FFA_RUN_WAKE_UP.
Change-Id: I39f737af040dbc11e563de47ff9ade7a0979ffc9
Signed-off-by: Andrew Walbran <qwandor@google.com>
diff --git a/src/api.c b/src/api.c
index c911ebd..55e7b81 100644
--- a/src/api.c
+++ b/src/api.c
@@ -148,12 +148,9 @@
* Timer is pending, so the current vCPU should
* be run again right away.
*/
- primary_ret.func = FFA_INTERRUPT_32;
- /*
- * primary_ret.arg1 should already be set to the
- * current VM ID and vCPU ID.
- */
- primary_ret.arg2 = 0;
+ primary_ret = (struct ffa_value){
+ .func = FFA_INTERRUPT_32};
+
} else {
primary_ret.arg2 = remaining_ns;
}
@@ -244,7 +241,6 @@
{
struct ffa_value ret = {
.func = FFA_INTERRUPT_32,
- .arg1 = ffa_vm_vcpu(current->vm->id, vcpu_index(current)),
};
return api_switch_to_primary(current, ret, VCPU_STATE_PREEMPTED);
@@ -326,7 +322,7 @@
struct vcpu *api_wake_up(struct vcpu *current, struct vcpu *target_vcpu)
{
struct ffa_value ret = {
- .func = HF_FFA_RUN_WAKE_UP,
+ .func = FFA_INTERRUPT_32,
.arg1 = ffa_vm_vcpu(target_vcpu->vm->id,
vcpu_index(target_vcpu)),
};
@@ -979,7 +975,7 @@
* overwritten when the switch back to the primary occurs.
*/
ret.func = FFA_INTERRUPT_32;
- ret.arg1 = ffa_vm_vcpu(vm_id, vcpu_idx);
+ ret.arg1 = 0;
ret.arg2 = 0;
out: