refactor(firme): split ABI definitions from dispatcher API

Move FIRME ABI definitions into service-specific headers so consumers do
not need to depend on dispatcher internals for FID and feature-register
constants.

Keep the dispatcher registration contract unchanged; this change only
separates ABI declarations from the service registry API.

Change-Id: I078bbb9307797e07142e9261db2d9f1be65284b4
Signed-off-by: Harrison Mutai <harrison.mutai@arm.com>

5 files changed, 21 insertions, 11 deletions

diff --git a/services/std_svc/firme/firme_granule_management_service.c b/services/std_svc/firme/firme_granule_management_service.c
index 5669427a6..6672e1f3c 100644
--- a/services/std_svc/firme/firme_granule_management_service.c
+++ b/services/std_svc/firme/firme_granule_management_service.c
@@ -12,6 +12,7 @@
 #include <common/debug.h>
 #include <lib/gpt_rme/gpt_rme.h>
 #include <lib/smccc.h>
+#include <services/firme/firme_granule_mgmt.h>
 #include <services/firme_svc.h>
 #include <smccc_helpers.h>
 
diff --git a/services/std_svc/firme/firme_main.c b/services/std_svc/firme/firme_main.c
index 7940bcbff..dbc713cc9 100644
--- a/services/std_svc/firme/firme_main.c
+++ b/services/std_svc/firme/firme_main.c
@@ -12,6 +12,11 @@
 #include <common/debug.h>
 #include <lib/gpt_rme/gpt_rme.h>
 #include <lib/smccc.h>
+#include <services/firme/firme_attestation.h>
+#include <services/firme/firme_granule_mgmt.h>
+#include <services/firme/firme_ide_km.h>
+#include <services/firme/firme_idev.h>
+#include <services/firme/firme_mecid.h>
 #include <services/firme_svc.h>
 #include <smccc_helpers.h>
 
diff --git a/services/std_svc/firme/firme_mecid.c b/services/std_svc/firme/firme_mecid.c
index 7aef7ddbf..b029241c8 100644
--- a/services/std_svc/firme/firme_mecid.c
+++ b/services/std_svc/firme/firme_mecid.c
@@ -9,6 +9,7 @@
 
 #include <arch.h>
 #include <arch_features.h>
+#include <services/firme/firme_mecid.h>
 #include <services/firme_svc.h>
 #include <smccc_helpers.h>
 
diff --git a/services/std_svc/rmmd/rmmd_main.c b/services/std_svc/rmmd/rmmd_main.c
index 366ed8935..411ceb478 100644
--- a/services/std_svc/rmmd/rmmd_main.c
+++ b/services/std_svc/rmmd/rmmd_main.c
@@ -10,8 +10,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <arch_helpers.h>
+#include "rmmd_private.h"
+
 #include <arch_features.h>
+#include <arch_helpers.h>
 #include <bl31/bl31.h>
 #include <common/debug.h>
 #include <common/runtime_svc.h>
@@ -21,24 +23,24 @@
 #include <lib/el3_runtime/pubsub.h>
 #include <lib/extensions/mpam.h>
 #include <lib/extensions/pmuv3.h>
+#include <lib/extensions/sme.h>
+#include <lib/extensions/spe.h>
+#include <lib/extensions/sve.h>
 #include <lib/extensions/sys_reg_trace.h>
+#include <lib/extensions/trbe.h>
 #include <lib/gpt_rme/gpt_rme.h>
 #include <lib/per_cpu/per_cpu.h>
-
 #include <lib/spinlock.h>
 #include <lib/utils.h>
 #include <lib/xlat_tables/xlat_tables_v2.h>
 #include <plat/common/common_def.h>
 #include <plat/common/platform.h>
-#include <platform_def.h>
-#include <services/rmmd_svc.h>
+#include <services/firme/firme_mecid.h>
 #include <services/firme_svc.h>
+#include <services/rmmd_svc.h>
 #include <smccc_helpers.h>
-#include <lib/extensions/sme.h>
-#include <lib/extensions/sve.h>
-#include <lib/extensions/spe.h>
-#include <lib/extensions/trbe.h>
-#include "rmmd_private.h"
+
+#include <platform_def.h>
 
 #define MECID_SHIFT			U(32)
 #define MECID_MASK			0xFFFFU
diff --git a/services/std_svc/rmmd/trp/trp_main.c b/services/std_svc/rmmd/trp/trp_main.c
index 8a4f08259..a682d64ec 100644
--- a/services/std_svc/rmmd/trp/trp_main.c
+++ b/services/std_svc/rmmd/trp/trp_main.c
@@ -3,16 +3,17 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include "trp_private.h"
+
 #include <common/build_message.h>
 #include <common/debug.h>
 #include <lib/gpt_rme/gpt_rme.h>
 #include <plat/common/platform.h>
-#include <services/firme_svc.h>
+#include <services/firme/firme_granule_mgmt.h>
 #include <services/rmm_core_manifest.h>
 #include <services/rmmd_svc.h>
 #include <services/trp/platform_trp.h>
 #include <trp_helpers.h>
-#include "trp_private.h"
 
 #include <platform_def.h>