commit 121f88bdce94445e4bea39e75373f41947110b0d
author Andrew Walbran <qwandor@google.com> Thu Oct 03 14:29:03 2019 +0100
committer Andrew Walbran <qwandor@google.com> Thu Oct 03 15:48:57 2019 +0100
tree a9936a112c435e36b75fd23ba37441d0713b9523
parent d4d2fa1f4c1727122592072248c898c519f9e1ff

Return results 4–7 from SMC calls.

Bug: 141469322
Change-Id: I796307e905db0c6f19bb23586300a8293dc07d7e

src/arch/aarch64/hypervisor/handler.c

diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index d58a600..acbe562 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -583,7 +583,10 @@
 
 	case 0x17: /* EC = 010111, SMC instruction. */ {
 		uintreg_t smc_pc = vcpu->regs.pc;
-		struct smc_result ret = {0};
+		struct smc_result ret = {.res4 = vcpu->regs.r[4],
+					 .res5 = vcpu->regs.r[5],
+					 .res6 = vcpu->regs.r[6],
+					 .res7 = vcpu->regs.r[7]};
 		struct vcpu *next = NULL;
 
 		if (!smc_handler(vcpu, &ret, &next)) {
@@ -598,6 +601,10 @@
 		vcpu->regs.r[1] = ret.res1;
 		vcpu->regs.r[2] = ret.res2;
 		vcpu->regs.r[3] = ret.res3;
+		vcpu->regs.r[4] = ret.res4;
+		vcpu->regs.r[5] = ret.res5;
+		vcpu->regs.r[6] = ret.res6;
+		vcpu->regs.r[7] = ret.res7;
 		return next;
 	}