commit 3bb825946fed3515cb895503d479cdf6f7edad8c
author J-Alves <joao.alves@arm.com> Mon Jan 23 11:20:54 2023 +0000
committer Joao Alves <joao.alves@arm.com> Wed Sep 18 11:47:36 2024 +0200
tree 5562a9d0202210d4a47760ed28021fdb76132442
parent 8ccd2d0f055237369fcaccfcf813d01280bcd88d

fix(indirect message): set framework notifications

Set framework notifications only when receipt of notifications is
supported by the given partition.

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

src/api.c

diff --git a/src/api.c b/src/api.c
index b4f5726..a1a4b6f 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2009,7 +2009,6 @@
 	ffa_id_t sender_id;
 	ffa_id_t receiver_id;
 	uint32_t msg_size;
-	ffa_notifications_bitmap_t rx_buffer_full;
 
 	alignas(8) struct ffa_partition_rxtx_header header;
 
@@ -2156,17 +2155,29 @@
 	to->mailbox.recv_func = FFA_MSG_SEND2_32;
 	to->mailbox.state = MAILBOX_STATE_FULL;
 
-	rx_buffer_full = ffa_is_vm_id(sender_id)
-				 ? FFA_NOTIFICATION_HYP_BUFFER_FULL_MASK
-				 : FFA_NOTIFICATION_SPM_BUFFER_FULL_MASK;
-	vm_notifications_framework_set_pending(to_locked, rx_buffer_full);
+	/*
+	 * Set framework notifications, only if the SP has enabled
+	 * receipt of notifications.
+	 * If VMs have provided the RX buffer it is implied they already
+	 * support indirect messaging, and therefore framework notifications.
+	 */
+	if (ffa_is_vm_id(to_locked.vm->id) ||
+	    vm_are_notifications_enabled(to_locked.vm)) {
+		ffa_notifications_bitmap_t rx_buffer_full =
+			ffa_is_vm_id(sender_id)
+				? FFA_NOTIFICATION_HYP_BUFFER_FULL_MASK
+				: FFA_NOTIFICATION_SPM_BUFFER_FULL_MASK;
 
-	if ((FFA_NOTIFICATIONS_FLAG_DELAY_SRI & flags) == 0) {
-		dlog_verbose("SRI was NOT delayed. vcpu: %u!\n",
-			     vcpu_index(current));
-		plat_ffa_sri_trigger_not_delayed(current->cpu);
-	} else {
-		plat_ffa_sri_state_set(DELAYED);
+		vm_notifications_framework_set_pending(to_locked,
+						       rx_buffer_full);
+
+		if ((FFA_NOTIFICATIONS_FLAG_DELAY_SRI & flags) == 0) {
+			dlog_verbose("SRI was NOT delayed. vcpu: %u!\n",
+				     vcpu_index(current));
+			plat_ffa_sri_trigger_not_delayed(current->cpu);
+		} else {
+			plat_ffa_sri_state_set(DELAYED);
+		}
 	}
 
 	ret = (struct ffa_value){.func = FFA_SUCCESS_32};