commit fed412eb6807cc00bcf8cc9b8bbbe0cb0adffbcf
author Andrew Walbran <qwandor@google.com> Mon Sep 02 18:23:16 2019 +0100
committer Andrew Walbran <qwandor@google.com> Thu Sep 12 14:50:04 2019 +0100
tree 3484edec18f2df2d606d57e39afee5e324fd1392
parent 7d28d9ab2fe3b45e16e9ccb772251f8b8e610911

Let hvc_handler return 4 registers rather than just one.

Bug: 132395846
Change-Id: Ibc86ba2f24fdfcb55f08aae48e5769cea31c2cd5

src/arch/aarch64/hypervisor/handler.c

diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index 1282b81..d896c80 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -50,7 +50,7 @@
 #define GET_NEXT_PC_INC(esr) (((esr) & (1u << 25)) ? 4 : 2)
 
 struct hvc_handler_return {
-	uintreg_t user_ret;
+	smc_res_t user_ret;
 	struct vcpu *new;
 };
 
@@ -370,76 +370,77 @@
 
 	ret.new = NULL;
 
-	if (psci_handler(current(), arg0, arg1, arg2, arg3, &ret.user_ret,
+	if (psci_handler(current(), arg0, arg1, arg2, arg3, &ret.user_ret.res0,
 			 &ret.new)) {
 		return ret;
 	}
 
-	if (spci_handler(arg0, arg1, arg2, arg3, &ret.user_ret, &ret.new)) {
+	if (spci_handler(arg0, arg1, arg2, arg3, &ret.user_ret.res0,
+			 &ret.new)) {
 		update_vi(ret.new);
 		return ret;
 	}
 
 	switch ((uint32_t)arg0) {
 	case HF_VM_GET_ID:
-		ret.user_ret = api_vm_get_id(current());
+		ret.user_ret.res0 = api_vm_get_id(current());
 		break;
 
 	case HF_VM_GET_COUNT:
-		ret.user_ret = api_vm_get_count();
+		ret.user_ret.res0 = api_vm_get_count();
 		break;
 
 	case HF_VCPU_GET_COUNT:
-		ret.user_ret = api_vcpu_get_count(arg1, current());
+		ret.user_ret.res0 = api_vcpu_get_count(arg1, current());
 		break;
 
 	case HF_VCPU_RUN:
-		ret.user_ret = hf_vcpu_run_return_encode(
+		ret.user_ret.res0 = hf_vcpu_run_return_encode(
 			api_vcpu_run(arg1, arg2, current(), &ret.new));
 		break;
 
 	case HF_VM_CONFIGURE:
-		ret.user_ret = api_vm_configure(ipa_init(arg1), ipa_init(arg2),
-						current(), &ret.new);
+		ret.user_ret.res0 = api_vm_configure(
+			ipa_init(arg1), ipa_init(arg2), current(), &ret.new);
 		break;
 
 	case HF_MAILBOX_CLEAR:
-		ret.user_ret = api_mailbox_clear(current(), &ret.new);
+		ret.user_ret.res0 = api_mailbox_clear(current(), &ret.new);
 		break;
 
 	case HF_MAILBOX_WRITABLE_GET:
-		ret.user_ret = api_mailbox_writable_get(current());
+		ret.user_ret.res0 = api_mailbox_writable_get(current());
 		break;
 
 	case HF_MAILBOX_WAITER_GET:
-		ret.user_ret = api_mailbox_waiter_get(arg1, current());
+		ret.user_ret.res0 = api_mailbox_waiter_get(arg1, current());
 		break;
 
 	case HF_INTERRUPT_ENABLE:
-		ret.user_ret = api_interrupt_enable(arg1, arg2, current());
+		ret.user_ret.res0 = api_interrupt_enable(arg1, arg2, current());
 		break;
 
 	case HF_INTERRUPT_GET:
-		ret.user_ret = api_interrupt_get(current());
+		ret.user_ret.res0 = api_interrupt_get(current());
 		break;
 
 	case HF_INTERRUPT_INJECT:
-		ret.user_ret = api_interrupt_inject(arg1, arg2, arg3, current(),
-						    &ret.new);
+		ret.user_ret.res0 = api_interrupt_inject(arg1, arg2, arg3,
+							 current(), &ret.new);
 		break;
 
 	case HF_SHARE_MEMORY:
-		ret.user_ret =
+		ret.user_ret.res0 =
 			api_share_memory(arg1 >> 32, ipa_init(arg2), arg3,
 					 arg1 & 0xffffffff, current());
 		break;
 
 	case HF_DEBUG_LOG:
-		ret.user_ret = api_debug_log(arg1, current());
+		ret.user_ret.res0 = api_debug_log(arg1, current());
 		break;
 
 	default:
-		ret.user_ret = -1;
+		ret.user_ret.res0 = -1;
 	}
 
 	update_vi(ret.new);