commit de3f79f10aca2cfa436c03ca3b11c91f8b431931
author David Hu <david.hu@arm.com> Thu Nov 14 16:56:51 2019 +0800
committer David Hu <david.hu@arm.com> Fri Feb 14 11:06:52 2020 +0800
tree 8ab3d8d0c4740a4ea41cb0332b0b3c6e82c8abea
parent 286b94a8db42f9d341506d39322892fce04e8d17

Dualcpu: Adjust the definition number of mailbox queue slots

If multiple outstanding NS PSA Client calls feature is enabled,
require platform to define NUM_MAILBOX_QUEUE_SLOT in platform
specific device_cfg.h.
Otherwise, define NUM_MAILBOX_QUEUE_SLOT as 1 in tfm_mailbox.h.

Also fix the initialization of queue empty slot status variables
since NUM_MAILBOX_QUEUE_SLOT can be set to 32.

Change-Id: I26ea1283f8c6cad9ebe31b24c06ddccf3d2e5699
Signed-off-by: David Hu <david.hu@arm.com>

interface/src/tfm_ns_mailbox.c

diff --git a/interface/src/tfm_ns_mailbox.c b/interface/src/tfm_ns_mailbox.c
index a623a7b..2690bd4 100644
--- a/interface/src/tfm_ns_mailbox.c
+++ b/interface/src/tfm_ns_mailbox.c
@@ -301,8 +301,10 @@
     memset(queue, 0, sizeof(*queue));
 
     /* Initialize empty bitmask */
-    queue->empty_slots = (mailbox_queue_status_t)((1 << NUM_MAILBOX_QUEUE_SLOT)
-                                                  - 1);
+    queue->empty_slots =
+            (mailbox_queue_status_t)((1UL << (NUM_MAILBOX_QUEUE_SLOT - 1)) - 1);
+    queue->empty_slots +=
+            (mailbox_queue_status_t)(1UL << (NUM_MAILBOX_QUEUE_SLOT - 1));
 
     mailbox_queue_ptr = queue;