Refactor FF-A boot info
Refactor the FF-A boot info related types to prepare for adding the FF-A
v1.1 structures.
Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Change-Id: I03dd0275d367611e6156c4ba47bdbacb62296001
diff --git a/deployments/attestation/env/commonsp/attestation_sp.c b/deployments/attestation/env/commonsp/attestation_sp.c
index b84fd23..266f3fb 100644
--- a/deployments/attestation/env/commonsp/attestation_sp.c
+++ b/deployments/attestation/env/commonsp/attestation_sp.c
@@ -28,7 +28,7 @@
static bool sp_init(uint16_t *own_sp_id);
static bool locate_crypto_service(void);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
/* Service provider objects */
struct attest_provider attest_provider = { 0 };
@@ -57,7 +57,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/block-storage/env/commonsp/block_storage_sp.c b/deployments/block-storage/env/commonsp/block_storage_sp.c
index 012250c..5f3d53c 100644
--- a/deployments/block-storage/env/commonsp/block_storage_sp.c
+++ b/deployments/block-storage/env/commonsp/block_storage_sp.c
@@ -20,7 +20,7 @@
static bool sp_init(uint16_t *own_sp_id);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct ffa_call_ep ffarpc_call_ep = { 0 };
struct block_storage_provider service_provider = { 0 };
@@ -39,7 +39,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/crypto/env/commonsp/crypto_sp.c b/deployments/crypto/env/commonsp/crypto_sp.c
index 2e6018e..a8abd46 100644
--- a/deployments/crypto/env/commonsp/crypto_sp.c
+++ b/deployments/crypto/env/commonsp/crypto_sp.c
@@ -18,7 +18,7 @@
static bool sp_init(uint16_t *own_sp_id);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct crypto_provider *crypto_provider = NULL;
struct ffa_call_ep ffarpc_call_ep = { 0 };
@@ -38,7 +38,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/env-test/env/commonsp/env_test_sp.c b/deployments/env-test/env/commonsp/env_test_sp.c
index 3b1f472..35c871b 100644
--- a/deployments/env-test/env/commonsp/env_test_sp.c
+++ b/deployments/env-test/env/commonsp/env_test_sp.c
@@ -18,7 +18,7 @@
static bool sp_init(uint16_t *own_sp_id);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct test_runner_provider test_runner_provider = { 0 };
struct ffa_call_ep ffarpc_call_ep = { 0 };
@@ -36,7 +36,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/fwu/env/commonsp/fwu_sp.c b/deployments/fwu/env/commonsp/fwu_sp.c
index 0dce92e..812db1e 100644
--- a/deployments/fwu/env/commonsp/fwu_sp.c
+++ b/deployments/fwu/env/commonsp/fwu_sp.c
@@ -41,7 +41,7 @@
static bool configure_for_platform(void);
const struct metadata_serializer *select_metadata_serializer(unsigned int version);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct ffa_call_ep ffarpc_call_ep = { 0 };
struct fwu_provider service_provider = { 0 };
@@ -61,7 +61,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/internal-trusted-storage/env/commonsp/its_sp.c b/deployments/internal-trusted-storage/env/commonsp/its_sp.c
index 4c694ef..a1fe67f 100644
--- a/deployments/internal-trusted-storage/env/commonsp/its_sp.c
+++ b/deployments/internal-trusted-storage/env/commonsp/its_sp.c
@@ -17,7 +17,7 @@
static uint8_t tx_buffer[4096] __aligned(4096);
static uint8_t rx_buffer[4096] __aligned(4096);
-void sp_main(struct ffa_init_info *init_info)
+void sp_main(union ffa_boot_info *boot_info)
{
sp_result result = SP_RESULT_INTERNAL_ERROR;
struct rpc_interface *secure_storage_iface = NULL;
@@ -29,7 +29,7 @@
uint16_t own_id = 0;
/* Boot */
- (void) init_info;
+ (void)boot_info;
result = sp_rxtx_buffer_map(tx_buffer, rx_buffer, sizeof(rx_buffer));
if (result != SP_RESULT_OK) {
diff --git a/deployments/protected-storage/env/commonsp/ps_sp.c b/deployments/protected-storage/env/commonsp/ps_sp.c
index d4db0af..acd651b 100644
--- a/deployments/protected-storage/env/commonsp/ps_sp.c
+++ b/deployments/protected-storage/env/commonsp/ps_sp.c
@@ -17,7 +17,7 @@
static uint8_t tx_buffer[4096] __aligned(4096);
static uint8_t rx_buffer[4096] __aligned(4096);
-void sp_main(struct ffa_init_info *init_info)
+void sp_main(union ffa_boot_info *boot_info)
{
sp_result result = SP_RESULT_INTERNAL_ERROR;
struct rpc_interface *secure_storage_iface = NULL;
@@ -29,7 +29,7 @@
uint16_t own_id = 0;
/* Boot */
- (void) init_info;
+ (void)boot_info;
result = sp_rxtx_buffer_map(tx_buffer, rx_buffer, sizeof(rx_buffer));
if (result != SP_RESULT_OK) {
diff --git a/deployments/se-proxy/env/commonsp/se_proxy_sp.c b/deployments/se-proxy/env/commonsp/se_proxy_sp.c
index 45fcb38..5990bb2 100644
--- a/deployments/se-proxy/env/commonsp/se_proxy_sp.c
+++ b/deployments/se-proxy/env/commonsp/se_proxy_sp.c
@@ -16,7 +16,7 @@
static bool sp_init(uint16_t *own_sp_id);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct ffa_call_ep ffarpc_call_ep = { 0 };
struct sp_msg req_msg = { 0 };
@@ -34,7 +34,7 @@
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}
diff --git a/deployments/sfs-demo/common/sfs_demo_sp.c b/deployments/sfs-demo/common/sfs_demo_sp.c
index ee0c93f..d7aaf71 100644
--- a/deployments/sfs-demo/common/sfs_demo_sp.c
+++ b/deployments/sfs-demo/common/sfs_demo_sp.c
@@ -122,7 +122,7 @@
IMSG("ITS test done");
}
-void __noreturn sp_main(struct ffa_init_info *init_info) {
+void __noreturn sp_main(union ffa_boot_info *boot_info) {
sp_result result = SP_RESULT_INTERNAL_ERROR;
struct sp_msg req_msg = { 0 };
@@ -136,7 +136,7 @@
psa_status_t psa_status = PSA_ERROR_GENERIC_ERROR;
/* Boot */
- (void) init_info;
+ (void)boot_info;
IMSG("Test SP started");
result = sp_rxtx_buffer_map(tx_buffer, rx_buffer, sizeof(rx_buffer));
diff --git a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
index 98388bb..9fbaa87 100644
--- a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
+++ b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
@@ -23,7 +23,7 @@
static bool sp_init(uint16_t *own_sp_id);
-void __noreturn sp_main(struct ffa_init_info *init_info)
+void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct memory_region mm_comm_buffer_region = { 0 };
struct rpc_interface *gateway_iface = NULL;
@@ -46,7 +46,7 @@
/* Load any dynamic configuration */
config_ramstore_init();
- if (!sp_config_load(init_info)) {
+ if (!sp_config_load(boot_info)) {
EMSG("Failed to load SP config");
goto fatal_error;
}