Dualcpu: Rename MAILBOX_SIGNAL to MAILBOX_INTERRUPT_SIGNAL
Rename the Mailbox signal name to align with Mailbox NS Agent
update document.
Change-Id: I1521e7f62a44d9aaa3aa681508f871ea85784297
Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
diff --git a/docs/design_docs/dual-cpu/communication_prototype_between_nspe_and_spe_in_dual_core_systems.rst b/docs/design_docs/dual-cpu/communication_prototype_between_nspe_and_spe_in_dual_core_systems.rst
index 21ee9c8..bf97e09 100644
--- a/docs/design_docs/dual-cpu/communication_prototype_between_nspe_and_spe_in_dual_core_systems.rst
+++ b/docs/design_docs/dual-cpu/communication_prototype_between_nspe_and_spe_in_dual_core_systems.rst
@@ -155,7 +155,7 @@
1. Platform specific Inter-Processor Communication interrupt handler is
triggered after the mailbox event is asserted by NSPE. The interrupt handler
shall call ``spm_handle_interrupt()``
-2. SPM will send a ``SIGNAL_MAILBOX`` to ``ns_agent_mailbox`` partition
+2. SPM will send a ``MAILBOX_INTERRUPT_SIGNAL`` to ``ns_agent_mailbox`` partition
3. ``ns_agent_mailbox`` partition deals with the mailbox message(s) which
contain(s) the PSA client call information and parameters.
Then the PSA client call request is dispatched to dedicated PSA client call
@@ -235,7 +235,7 @@
This partition will call ``tfm_hal_boot_ns_cpu()`` and
tfm_hal_wait_for_ns_cpu_ready() to ensure that the non-secure core is running.
It will then initialise the SPE mailbox and enable the IPC interrupt. Once these
-tasks are complete, it will enter an infinite loop waiting for a MAILBOX_SIGNAL
+tasks are complete, it will enter an infinite loop waiting for a ``MAILBOX_INTERRUPT_SIGNAL``
signal indicating that a mailbox message has arrived.
Mailbox handling will be done in the context of the ``ns_agent_mailbox``
diff --git a/docs/design_docs/dual-cpu/mailbox_design_on_dual_core_system.rst b/docs/design_docs/dual-cpu/mailbox_design_on_dual_core_system.rst
index 318600b..69730d0 100644
--- a/docs/design_docs/dual-cpu/mailbox_design_on_dual_core_system.rst
+++ b/docs/design_docs/dual-cpu/mailbox_design_on_dual_core_system.rst
@@ -449,7 +449,7 @@
Platform specific Inter-Processor Communication interrupt handler in SPE should
call ``spm_handle_interrupt()`` to notify SPM of the interrupt. SPM will then
-send the ``SIGNAL_MAILBOX`` signal to the ``ns_agent_mailbox`` partition, which
+send the ``MAILBOX_INTERRUPT_SIGNAL`` signal to the ``ns_agent_mailbox`` partition, which
will call ``tfm_rpc_client_call_handler()``.
**********************
diff --git a/platform/ext/target/arm/rss/common/tfm_interrupts.c b/platform/ext/target/arm/rss/common/tfm_interrupts.c
index b3c9391..35b3534 100644
--- a/platform/ext/target/arm/rss/common/tfm_interrupts.c
+++ b/platform/ext/target/arm/rss/common/tfm_interrupts.c
@@ -50,7 +50,7 @@
&MHU_RSS_TO_AP_MONITOR_DEV);
/*
- * SPM will send a MAILBOX_SIGNAL to the corresponding partition
+ * SPM will send a MAILBOX_INTERRUPT_SIGNAL to the corresponding partition
* indicating that a message has arrived and can be processed.
*/
spm_handle_interrupt(mbox_irq_info.p_pt, mbox_irq_info.p_ildi);
diff --git a/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.c b/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.c
index 459b3d7..6088559 100644
--- a/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.c
+++ b/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.c
@@ -36,12 +36,12 @@
psa_panic();
}
- psa_irq_enable(MAILBOX_SIGNAL);
+ psa_irq_enable(MAILBOX_INTERRUPT_SIGNAL);
while (1) {
signals = psa_wait(PSA_WAIT_ANY, PSA_BLOCK);
- if (signals & MAILBOX_SIGNAL) {
- psa_eoi(MAILBOX_SIGNAL);
+ if (signals & MAILBOX_INTERRUPT_SIGNAL) {
+ psa_eoi(MAILBOX_INTERRUPT_SIGNAL);
tfm_rpc_client_call_handler();
#if CONFIG_TFM_SPM_BACKEND_IPC == 1
} else if (signals & ASYNC_MSG_REPLY) {
diff --git a/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.yaml b/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.yaml
index a2d402d..4f17f54 100644
--- a/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.yaml
+++ b/secure_fw/partitions/ns_agent_mailbox/ns_agent_mailbox.yaml
@@ -19,7 +19,7 @@
"irqs": [
{
"source": "MAILBOX_IRQ",
- "name": "MAILBOX",
+ "name": "MAILBOX_INTERRUPT",
"handling": "SLIH"
}
],