commit 902af086a232360a032a23a6c084c55179a38d86
author Karl Meakin <karl.meakin@arm.com> Thu Nov 28 14:58:38 2024 +0000
committer Karl Meakin <karl.meakin@arm.com> Mon Dec 09 15:38:56 2024 +0000
tree fa3b828786c58395db0357a976cd0e38aaa149b6
parent 0cdd6b2f241eaa96d1cb80056044e0b5b5801879

refactor: move `inc/hf/arch/plat/ffa` to `inc/hf/ffa`

Change-Id: I05c2cd1aa3753cd60021015c4582831eb03db3c9
Signed-off-by: Karl Meakin <karl.meakin@arm.com>

src/api.c

diff --git a/src/api.c b/src/api.c
index d8c91ba..81e7e24 100644
--- a/src/api.c
+++ b/src/api.c
@@ -13,30 +13,27 @@
 #include "hf/arch/memcpy_trapped.h"
 #include "hf/arch/mm.h"
 #include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/cpu_cycles.h"
-#include "hf/arch/plat/ffa/direct_messaging.h"
-#include "hf/arch/plat/ffa/ffa_memory.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
-#include "hf/arch/plat/ffa/interrupts.h"
-#include "hf/arch/plat/ffa/notifications.h"
-#include "hf/arch/plat/ffa/power_management.h"
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
-#include "hf/arch/plat/ffa/vm.h"
 #include "hf/arch/timer.h"
-#include "hf/arch/vm.h"
 
 #include "hf/bits.h"
 #include "hf/check.h"
 #include "hf/dlog.h"
+#include "hf/ffa.h"
+#include "hf/ffa/cpu_cycles.h"
+#include "hf/ffa/direct_messaging.h"
+#include "hf/ffa/ffa_memory.h"
+#include "hf/ffa/indirect_messaging.h"
+#include "hf/ffa/interrupts.h"
+#include "hf/ffa/notifications.h"
+#include "hf/ffa/power_management.h"
+#include "hf/ffa/setup_and_discovery.h"
+#include "hf/ffa/vm.h"
 #include "hf/ffa_internal.h"
 #include "hf/ffa_memory.h"
 #include "hf/ffa_v1_0.h"
 #include "hf/hf_ipi.h"
 #include "hf/mm.h"
-#include "hf/plat/console.h"
 #include "hf/plat/interrupts.h"
-#include "hf/spinlock.h"
 #include "hf/static_assert.h"
 #include "hf/std.h"
 #include "hf/timer_mgmt.h"

src/arch/aarch64/hypervisor/ffa.c

diff --git a/src/arch/aarch64/hypervisor/ffa.c b/src/arch/aarch64/hypervisor/ffa.c
index 73e3c7e..880a5e86 100644
--- a/src/arch/aarch64/hypervisor/ffa.c
+++ b/src/arch/aarch64/hypervisor/ffa.c
@@ -6,12 +6,10 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa.h"
-
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
+#include "hf/ffa.h"
 
 #include "hf/check.h"
-#include "hf/ffa.h"
+#include "hf/ffa/setup_and_discovery.h"
 #include "hf/panic.h"
 #include "hf/vm_ids.h"
 

src/arch/aarch64/hypervisor/handler.c

diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index c4eaf07..d501eac 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -11,14 +11,8 @@
 #include "hf/arch/barriers.h"
 #include "hf/arch/gicv3.h"
 #include "hf/arch/host_timer.h"
-#include "hf/arch/init.h"
 #include "hf/arch/memcpy_trapped.h"
 #include "hf/arch/mmu.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
-#include "hf/arch/plat/ffa/interrupts.h"
-#include "hf/arch/plat/ffa/notifications.h"
-#include "hf/arch/plat/ffa/vm.h"
 #include "hf/arch/plat/smc.h"
 #include "hf/arch/timer.h"
 #include "hf/arch/vmid_base.h"
@@ -28,15 +22,15 @@
 #include "hf/cpu.h"
 #include "hf/dlog.h"
 #include "hf/ffa.h"
+#include "hf/ffa/indirect_messaging.h"
+#include "hf/ffa/interrupts.h"
+#include "hf/ffa/notifications.h"
+#include "hf/ffa/vm.h"
 #include "hf/ffa_internal.h"
-#include "hf/hf_ipi.h"
 #include "hf/panic.h"
 #include "hf/plat/interrupts.h"
 #include "hf/timer_mgmt.h"
 #include "hf/vm.h"
-#include "hf/vm_ids.h"
-
-#include "vmapi/hf/call.h"
 
 #include "debug_el1.h"
 #include "el1_physical_timer.h"

src/arch/aarch64/hypervisor/other_world.c

diff --git a/src/arch/aarch64/hypervisor/other_world.c b/src/arch/aarch64/hypervisor/other_world.c
index 1468cf9..3f846b5 100644
--- a/src/arch/aarch64/hypervisor/other_world.c
+++ b/src/arch/aarch64/hypervisor/other_world.c
@@ -9,7 +9,6 @@
 #include "hf/arch/other_world.h"
 
 #include "hf/arch/mmu.h"
-#include "hf/arch/plat/ffa.h"
 
 #include "hf/check.h"
 #include "hf/dlog.h"

src/arch/aarch64/inc/hf/arch/types.h

diff --git a/src/arch/aarch64/inc/hf/arch/types.h b/src/arch/aarch64/inc/hf/arch/types.h
index e9298da..1ad8f0c 100644
--- a/src/arch/aarch64/inc/hf/arch/types.h
+++ b/src/arch/aarch64/inc/hf/arch/types.h
@@ -11,7 +11,6 @@
 #include <stdalign.h>
 #include <stdint.h>
 
-#include "hf/ffa.h"
 #include "hf/static_assert.h"
 
 #define PAGE_BITS 12

src/arch/aarch64/plat/psci/spmc.c

diff --git a/src/arch/aarch64/plat/psci/spmc.c b/src/arch/aarch64/plat/psci/spmc.c
index 5932c4e..bef8b95 100644
--- a/src/arch/aarch64/plat/psci/spmc.c
+++ b/src/arch/aarch64/plat/psci/spmc.c
@@ -6,18 +6,14 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/notifications.h"
 #include "hf/arch/plat/psci.h"
 
 #include "hf/api.h"
 #include "hf/check.h"
 #include "hf/cpu.h"
-#include "hf/dlog.h"
+#include "hf/ffa/notifications.h"
 #include "hf/vm.h"
 
-#include "vmapi/hf/types.h"
-
 #include "psci.h"
 
 void cpu_entry(struct cpu *c);

src/arch/fake/hypervisor/ffa.c

diff --git a/src/arch/fake/hypervisor/ffa.c b/src/arch/fake/hypervisor/ffa.c
index 71fae1d..555bcf0 100644
--- a/src/arch/fake/hypervisor/ffa.c
+++ b/src/arch/fake/hypervisor/ffa.c
@@ -8,9 +8,7 @@
 
 #include "hf/ffa.h"
 
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/notifications.h"
-
+#include "hf/ffa/notifications.h"
 #include "hf/ffa_internal.h"
 #include "hf/vcpu.h"
 #include "hf/vm.h"

src/ffa/hypervisor.c

diff --git a/src/ffa/hypervisor.c b/src/ffa/hypervisor.c
index d812dac..20c6fbe 100644
--- a/src/ffa/hypervisor.c
+++ b/src/ffa/hypervisor.c
@@ -8,13 +8,12 @@
 
 #include "hf/arch/ffa.h"
 #include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
 
 #include "hf/api.h"
 #include "hf/dlog.h"
 #include "hf/ffa.h"
+#include "hf/ffa/indirect_messaging.h"
+#include "hf/ffa/setup_and_discovery.h"
 #include "hf/ffa_internal.h"
 #include "hf/vcpu.h"
 #include "hf/vm.h"

src/ffa/hypervisor/cpu_cycles.c

diff --git a/src/ffa/hypervisor/cpu_cycles.c b/src/ffa/hypervisor/cpu_cycles.c
index ca76143..667e0e9 100644
--- a/src/ffa/hypervisor/cpu_cycles.c
+++ b/src/ffa/hypervisor/cpu_cycles.c
@@ -7,9 +7,9 @@
  */
 
 #include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
 
 #include "hf/api.h"
+#include "hf/ffa/indirect_messaging.h"
 #include "hf/vcpu.h"
 
 bool plat_ffa_run_forward(ffa_id_t vm_id, ffa_vcpu_index_t vcpu_idx,

src/ffa/hypervisor/direct_messaging.c

diff --git a/src/ffa/hypervisor/direct_messaging.c b/src/ffa/hypervisor/direct_messaging.c
index e9c0562..2b78f4b 100644
--- a/src/ffa/hypervisor/direct_messaging.c
+++ b/src/ffa/hypervisor/direct_messaging.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/direct_messaging.h"
+#include "hf/ffa/direct_messaging.h"
 
 #include "hf/arch/other_world.h"
 

src/ffa/hypervisor/ffa_memory.c

diff --git a/src/ffa/hypervisor/ffa_memory.c b/src/ffa/hypervisor/ffa_memory.c
index 6e588cf..dfc5985 100644
--- a/src/ffa/hypervisor/ffa_memory.c
+++ b/src/ffa/hypervisor/ffa_memory.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/ffa_memory.h"
+#include "hf/ffa/ffa_memory.h"
 
 #include "hf/arch/other_world.h"
 

src/ffa/hypervisor/indirect_messaging.c

diff --git a/src/ffa/hypervisor/indirect_messaging.c b/src/ffa/hypervisor/indirect_messaging.c
index 14c4a60..0fd2b6c 100644
--- a/src/ffa/hypervisor/indirect_messaging.c
+++ b/src/ffa/hypervisor/indirect_messaging.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/indirect_messaging.h"
+#include "hf/ffa/indirect_messaging.h"
 
 #include "hf/arch/other_world.h"
 

src/ffa/hypervisor/notifications.c

diff --git a/src/ffa/hypervisor/notifications.c b/src/ffa/hypervisor/notifications.c
index 9fad3ea..69ea010 100644
--- a/src/ffa/hypervisor/notifications.c
+++ b/src/ffa/hypervisor/notifications.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/notifications.h"
+#include "hf/ffa/notifications.h"
 
 #include "hf/arch/other_world.h"
 

src/ffa/hypervisor/power_management.c

diff --git a/src/ffa/hypervisor/power_management.c b/src/ffa/hypervisor/power_management.c
index 549b0da..e1e81b2 100644
--- a/src/ffa/hypervisor/power_management.c
+++ b/src/ffa/hypervisor/power_management.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/power_management.h"
+#include "hf/ffa/power_management.h"
 
 /**
  * Returns FFA_ERROR as FFA_SECONDARY_EP_REGISTER is not supported at the

src/ffa/hypervisor/setup_and_discovery.c

diff --git a/src/ffa/hypervisor/setup_and_discovery.c b/src/ffa/hypervisor/setup_and_discovery.c
index f0c90a2..da9ebf7 100644
--- a/src/ffa/hypervisor/setup_and_discovery.c
+++ b/src/ffa/hypervisor/setup_and_discovery.c
@@ -6,12 +6,12 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
+#include "hf/ffa/setup_and_discovery.h"
 
 #include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa/vm.h"
 
 #include "hf/ffa.h"
+#include "hf/ffa/vm.h"
 #include "hf/manifest.h"
 #include "hf/vm.h"
 

src/ffa/spmc.c

diff --git a/src/ffa/spmc.c b/src/ffa/spmc.c
index d10eab3..ba59981 100644
--- a/src/ffa/spmc.c
+++ b/src/ffa/spmc.c
@@ -8,8 +8,6 @@
 
 #include "hf/arch/ffa.h"
 #include "hf/arch/gicv3.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/vm.h"
 #include "hf/arch/sve.h"
 
 #include "hf/api.h"
@@ -17,6 +15,7 @@
 #include "hf/check.h"
 #include "hf/dlog.h"
 #include "hf/ffa.h"
+#include "hf/ffa/vm.h"
 #include "hf/ffa_internal.h"
 #include "hf/plat/interrupts.h"
 #include "hf/vcpu.h"

src/ffa/spmc/cpu_cycles.c

diff --git a/src/ffa/spmc/cpu_cycles.c b/src/ffa/spmc/cpu_cycles.c
index c878db4..0d1a99f 100644
--- a/src/ffa/spmc/cpu_cycles.c
+++ b/src/ffa/spmc/cpu_cycles.c
@@ -7,11 +7,11 @@
  */
 
 #include "hf/arch/gicv3.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/interrupts.h"
 
 #include "hf/api.h"
 #include "hf/check.h"
+#include "hf/ffa.h"
+#include "hf/ffa/interrupts.h"
 #include "hf/plat/interrupts.h"
 #include "hf/vm.h"
 

src/ffa/spmc/direct_messaging.c

diff --git a/src/ffa/spmc/direct_messaging.c b/src/ffa/spmc/direct_messaging.c
index 1f3edf5..a06594f 100644
--- a/src/ffa/spmc/direct_messaging.c
+++ b/src/ffa/spmc/direct_messaging.c
@@ -6,10 +6,9 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/direct_messaging.h"
+#include "hf/ffa/direct_messaging.h"
 
-#include "hf/arch/plat/ffa.h"
-
+#include "hf/ffa.h"
 #include "hf/vm.h"
 
 bool plat_ffa_is_direct_request_valid(struct vcpu *current,

src/ffa/spmc/ffa_memory.c

diff --git a/src/ffa/spmc/ffa_memory.c b/src/ffa/spmc/ffa_memory.c
index 57d7834..1532727 100644
--- a/src/ffa/spmc/ffa_memory.c
+++ b/src/ffa/spmc/ffa_memory.c
@@ -9,8 +9,8 @@
 #include "hf/ffa_memory.h"
 
 #include "hf/arch/mmu.h"
-#include "hf/arch/plat/ffa/ffa_memory.h"
 
+#include "hf/ffa/ffa_memory.h"
 #include "hf/ffa_internal.h"
 #include "hf/vm.h"
 

src/ffa/spmc/indirect_messaging.c

diff --git a/src/ffa/spmc/indirect_messaging.c b/src/ffa/spmc/indirect_messaging.c
index 9de7883..5012424 100644
--- a/src/ffa/spmc/indirect_messaging.c
+++ b/src/ffa/spmc/indirect_messaging.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/indirect_messaging.h"
+#include "hf/ffa/indirect_messaging.h"
 
 #include "hf/vm.h"
 

src/ffa/spmc/interrupts.c

diff --git a/src/ffa/spmc/interrupts.c b/src/ffa/spmc/interrupts.c
index 79521f7..729c5cc 100644
--- a/src/ffa/spmc/interrupts.c
+++ b/src/ffa/spmc/interrupts.c
@@ -10,10 +10,10 @@
 
 #include "hf/arch/gicv3.h"
 #include "hf/arch/host_timer.h"
-#include "hf/arch/plat/ffa/vm.h"
 
 #include "hf/api.h"
 #include "hf/check.h"
+#include "hf/ffa/vm.h"
 #include "hf/hf_ipi.h"
 #include "hf/vm.h"
 

src/ffa/spmc/notifications.c

diff --git a/src/ffa/spmc/notifications.c b/src/ffa/spmc/notifications.c
index a185c2a..9d6b3d7 100644
--- a/src/ffa/spmc/notifications.c
+++ b/src/ffa/spmc/notifications.c
@@ -6,15 +6,14 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/notifications.h"
+#include "hf/ffa/notifications.h"
 
 #include <stdint.h>
 
-#include "hf/arch/plat/ffa/vm.h"
-
 #include "hf/check.h"
 #include "hf/cpu.h"
 #include "hf/ffa.h"
+#include "hf/ffa/vm.h"
 #include "hf/ffa_internal.h"
 #include "hf/plat/interrupts.h"
 #include "hf/types.h"

src/ffa/spmc/power_management.c

diff --git a/src/ffa/spmc/power_management.c b/src/ffa/spmc/power_management.c
index 0caefe6..f543059 100644
--- a/src/ffa/spmc/power_management.c
+++ b/src/ffa/spmc/power_management.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/power_management.h"
+#include "hf/ffa/power_management.h"
 
 /**
  * Returns FFA_SUCCESS as FFA_SECONDARY_EP_REGISTER is supported at the

src/ffa/spmc/setup_and_discovery.c

diff --git a/src/ffa/spmc/setup_and_discovery.c b/src/ffa/spmc/setup_and_discovery.c
index b3a5388..3b22714 100644
--- a/src/ffa/spmc/setup_and_discovery.c
+++ b/src/ffa/spmc/setup_and_discovery.c
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
+#include "hf/ffa/setup_and_discovery.h"
 
 #include "hf/ffa.h"
 #include "hf/manifest.h"

src/ffa/spmc/vm.c

diff --git a/src/ffa/spmc/vm.c b/src/ffa/spmc/vm.c
index 95d8521..f999248 100644
--- a/src/ffa/spmc/vm.c
+++ b/src/ffa/spmc/vm.c
@@ -8,10 +8,10 @@
 
 #include "hf/vm.h"
 
-#include "hf/arch/plat/ffa/vm.h"
 #include "hf/arch/std.h"
 
 #include "hf/check.h"
+#include "hf/ffa/vm.h"
 #include "hf/plat/interrupts.h"
 
 /**

src/ffa_memory.c

diff --git a/src/ffa_memory.c b/src/ffa_memory.c
index fd92e9f..43d6a2c 100644
--- a/src/ffa_memory.c
+++ b/src/ffa_memory.c
@@ -10,21 +10,15 @@
 
 #include "hf/arch/memcpy_trapped.h"
 #include "hf/arch/mm.h"
-#include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/ffa_memory.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
 
 #include "hf/addr.h"
-#include "hf/api.h"
-#include "hf/assert.h"
 #include "hf/check.h"
 #include "hf/dlog.h"
 #include "hf/ffa.h"
+#include "hf/ffa/ffa_memory.h"
+#include "hf/ffa/setup_and_discovery.h"
 #include "hf/ffa_internal.h"
 #include "hf/ffa_memory_internal.h"
-#include "hf/ffa_partition_manifest.h"
 #include "hf/mm.h"
 #include "hf/mpool.h"
 #include "hf/panic.h"

src/hf_ipi.c

diff --git a/src/hf_ipi.c b/src/hf_ipi.c
index 86f18c1..0964c13 100644
--- a/src/hf_ipi.c
+++ b/src/hf_ipi.c
@@ -8,9 +8,8 @@
 
 #include "hf/hf_ipi.h"
 
-#include "hf/arch/plat/ffa/notifications.h"
-
 #include "hf/cpu.h"
+#include "hf/ffa/notifications.h"
 #include "hf/plat/interrupts.h"
 
 /** Interrupt priority for Inter-Processor Interrupt. */

src/init.c

diff --git a/src/init.c b/src/init.c
index 8b73bed..957392d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -11,9 +11,6 @@
 #include <stdalign.h>
 #include <stddef.h>
 
-#include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-
 #include "hf/api.h"
 #include "hf/boot_flow.h"
 #include "hf/boot_params.h"
@@ -21,6 +18,7 @@
 #include "hf/cpu.h"
 #include "hf/dlog.h"
 #include "hf/fdt_handler.h"
+#include "hf/ffa.h"
 #include "hf/load.h"
 #include "hf/manifest.h"
 #include "hf/mm.h"
@@ -31,9 +29,6 @@
 #include "hf/plat/interrupts.h"
 #include "hf/plat/iommu.h"
 #include "hf/std.h"
-#include "hf/vm.h"
-
-#include "vmapi/hf/call.h"
 
 alignas(MM_PPOOL_ENTRY_SIZE) char ptable_buf[MM_PPOOL_ENTRY_SIZE * HEAP_PAGES];
 

src/load.c

diff --git a/src/load.c b/src/load.c
index a8b59d2..c3ae898 100644
--- a/src/load.c
+++ b/src/load.c
@@ -12,11 +12,6 @@
 
 #include "hf/arch/init.h"
 #include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/direct_messaging.h"
-#include "hf/arch/plat/ffa/interrupts.h"
-#include "hf/arch/plat/ffa/notifications.h"
-#include "hf/arch/plat/ffa/setup_and_discovery.h"
 #include "hf/arch/vm.h"
 
 #include "hf/api.h"
@@ -24,18 +19,19 @@
 #include "hf/check.h"
 #include "hf/dlog.h"
 #include "hf/fdt_patch.h"
+#include "hf/ffa/interrupts.h"
+#include "hf/ffa/notifications.h"
+#include "hf/ffa/setup_and_discovery.h"
 #include "hf/layout.h"
 #include "hf/manifest.h"
 #include "hf/memiter.h"
 #include "hf/mm.h"
 #include "hf/plat/console.h"
-#include "hf/plat/interrupts.h"
 #include "hf/plat/iommu.h"
 #include "hf/static_assert.h"
 #include "hf/std.h"
 #include "hf/vm.h"
 
-#include "vmapi/hf/call.h"
 #include "vmapi/hf/ffa.h"
 
 /**