commit cc542042dbbd81bf4d730c81d279ea3c6bf93c87
author J-Alves <joao.alves@arm.com> Wed Jul 24 19:13:22 2024 +0100
committer Joao Alves <joao.alves@arm.com> Mon Sep 09 16:38:55 2024 +0200
tree 2324b19b71edfd8045b4442e6c3f903545f68b0b
parent d533859d78260ffa9962c8d6a218c20bce405c5d

feat(interrupts): physical interrupt enabled

SPs are assigned with the interrupts related to
peripherals in their specific FF-A manifest.

The SPMC was enabling the physical interrupt,
when loading the respective partition.

This is changed in this patch to only be done
later at the call "HF_INTERRUPT_ENABLE".
This signals the SPMC that the SP is ready
to handle the given interrupt.

This prevents an IRQ from being pending before the
SP was even able to prepare itself to handle it.

Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I8a1704b46e41464c24a191ef8b9d41b1183e1aff

src/api.c

diff --git a/src/api.c b/src/api.c
index 85c1183..fce8e17 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2259,6 +2259,21 @@
 	return ret;
 }
 
+/*
+ * Returns true if intid relates with either of those:
+ * - NPI
+ * - ME
+ * - Virtual Timer.
+ *
+ * These are VIs with no expected interrupt descriptor.
+ */
+static bool api_is_maintenance_virtual_interrupt(uint32_t intid)
+{
+	return intid == HF_NOTIFICATION_PENDING_INTID ||
+	       intid == HF_MANAGED_EXIT_INTID ||
+	       intid == HF_VIRTUAL_TIMER_INTID;
+}
+
 /**
  * Enables or disables a given interrupt ID for the calling vCPU.
  *
@@ -2269,12 +2284,30 @@
 {
 	struct vcpu_locked current_locked;
 	struct interrupts *interrupts = &current->interrupts;
+	struct interrupt_descriptor *int_desc = NULL;
+	struct vm *vm = current->vm;
+	struct vm_locked vm_locked;
+
+	int64_t ret = -1;
 
 	if (intid >= HF_NUM_INTIDS) {
 		return -1;
 	}
 
+	vm_locked = vm_lock(vm);
 	current_locked = vcpu_lock(current);
+
+	int_desc = vm_interrupt_set_enable(vm_locked, intid, enable);
+
+	if (!api_is_maintenance_virtual_interrupt(intid)) {
+		if (int_desc == NULL) {
+			dlog_error("%s: invalid interrupt ID.\n", __func__);
+			goto out;
+		}
+
+		plat_interrupts_configure_interrupt(*int_desc);
+	}
+
 	if (enable) {
 		/*
 		 * If it is pending and was not enabled before, increment the
@@ -2285,6 +2318,7 @@
 			vcpu_interrupt_count_increment(current_locked,
 						       interrupts, intid);
 		}
+
 		vcpu_virt_interrupt_set_enabled(interrupts, intid);
 		vcpu_virt_interrupt_set_type(interrupts, intid, type);
 	} else {
@@ -2301,8 +2335,13 @@
 					     INTERRUPT_TYPE_IRQ);
 	}
 
+	ret = 0;
+
+out:
+	vm_unlock(&vm_locked);
 	vcpu_unlock(&current_locked);
-	return 0;
+
+	return ret;
 }
 
 static void api_interrupt_clear_decrement(struct vcpu_locked locked_vcpu,