commit c64d0645a4c4fa24afdc08f855d4801dc705bac3
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Wed Aug 07 16:55:46 2024 -0500
committer Madhukar Pappireddy <madhukar.pappireddy@arm.com> Wed Sep 11 15:02:43 2024 -0500
tree b6ace3875dbcd3f4d2ac6dd6b3157be255584daf
parent 32913cb081cf290123475ba6f01026dad8a1c66b

feat(interrupts): prioritize servicing queued virtual interrupts

Upon invocation of HF_INTERRUPT_GET by partition, SPMC shall return a
virtual interrupt from the vcpu's queue. If the queue is empty, it
shall return the numerically lowest pending interrupt from the
interrupt bitmap.

Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: Icee8a23349c7755e8620c5c97d0e8e81a5b9192a

src/arch/aarch64/hypervisor/handler.c

diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index 62d8200..e79330e 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -1114,10 +1114,14 @@
 						       args.arg3, vcpu);
 		break;
 
-	case HF_INTERRUPT_GET:
-		vcpu->regs.r[0] = api_interrupt_get(vcpu);
-		break;
+	case HF_INTERRUPT_GET: {
+		struct vcpu_locked current_locked;
 
+		current_locked = vcpu_lock(vcpu);
+		vcpu->regs.r[0] = plat_ffa_interrupt_get(current_locked);
+		vcpu_unlock(&current_locked);
+		break;
+	}
 	default:
 		vcpu->regs.r[0] = SMCCC_ERROR_UNKNOWN;
 		dlog_verbose("Unsupported function %#lx\n", args.func);