Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 1 | From ae22f5077d35e6acf3feb8a84a8ef7f599261b00 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> |
| 3 | Date: Wed, 17 Nov 2021 15:32:46 +0000 |
| 4 | Subject: [PATCH] Use device region |
| 5 | |
| 6 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 7 | Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> |
| 8 | |
| 9 | |
| 10 | --- |
| 11 | deployments/smm-gateway/opteesp/smm_gateway_sp.c | 8 ++++---- |
| 12 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/deployments/smm-gateway/opteesp/smm_gateway_sp.c b/deployments/smm-gateway/opteesp/smm_gateway_sp.c |
| 15 | index 6f138850..0bc09023 100644 |
| 16 | --- a/deployments/smm-gateway/opteesp/smm_gateway_sp.c |
| 17 | +++ b/deployments/smm-gateway/opteesp/smm_gateway_sp.c |
| 18 | @@ -10,7 +10,7 @@ |
| 19 | #include <config/loader/sp/sp_config_loader.h> |
| 20 | #include "components/rpc/mm_communicate/endpoint/sp/mm_communicate_call_ep.h" |
| 21 | #include "components/service/smm_variable/frontend/mm_communicate/smm_variable_mm_service.h" |
| 22 | -#include "platform/interface/memory_region.h" |
| 23 | +#include "platform/interface/device_region.h" |
| 24 | #include <ffa_api.h> |
| 25 | #include <sp_api.h> |
| 26 | #include <sp_messaging.h> |
| 27 | @@ -25,7 +25,7 @@ static int sp_init(uint16_t *own_sp_id); |
| 28 | |
| 29 | void __noreturn sp_main(struct ffa_init_info *init_info) |
| 30 | { |
| 31 | - struct memory_region mm_comm_buffer_region = { 0 }; |
| 32 | + struct device_region mm_comm_buffer_region = { 0 }; |
| 33 | struct rpc_interface *gateway_iface = NULL; |
| 34 | struct smm_variable_mm_service smm_var_service = { 0 }; |
| 35 | struct mm_service_interface *smm_var_service_interface = NULL; |
| 36 | @@ -42,7 +42,7 @@ void __noreturn sp_main(struct ffa_init_info *init_info) |
| 37 | config_ramstore_init(); |
| 38 | sp_config_load(init_info); |
| 39 | |
| 40 | - if (!config_store_query(CONFIG_CLASSIFIER_MEMORY_REGION, CONFIG_NAME_MM_COMM_BUFFER_REGION, |
| 41 | + if (!config_store_query(CONFIG_CLASSIFIER_DEVICE_REGION, CONFIG_NAME_MM_COMM_BUFFER_REGION, |
| 42 | 0, &mm_comm_buffer_region, sizeof(mm_comm_buffer_region))) { |
| 43 | EMSG(CONFIG_NAME_MM_COMM_BUFFER_REGION " is not set in SP configuration"); |
| 44 | goto fatal_error; |
| 45 | @@ -57,7 +57,7 @@ void __noreturn sp_main(struct ffa_init_info *init_info) |
| 46 | /* Initialize MM communication layer */ |
| 47 | if (!mm_communicate_call_ep_init(&mm_communicate_call_ep, |
| 48 | (void *)mm_comm_buffer_region.base_addr, |
| 49 | - mm_comm_buffer_region.region_size)) |
| 50 | + mm_comm_buffer_region.io_region_size)) |
| 51 | goto fatal_error; |
| 52 | |
| 53 | /* Attach SMM variable service to MM communication layer */ |