diff options
author | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-05-16 18:48:12 +0100 |
---|---|---|
committer | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-05-22 16:19:32 +0100 |
commit | 6871c5d3a227cb95008a25e90e358ec0ac615222 (patch) | |
tree | fe40950e7d517aa673ab2cc11b5255c4268ae291 /services | |
parent | 4112bfa0c223eda73af1cfe57ca7dc926f767dd8 (diff) |
Rework memory information passing to BL3-x images
The issues addressed in this patch are:
1. Remove meminfo_t from the common interfaces in BL3-x,
expecting that platform code will find a suitable mechanism
to determine the memory extents in these images and provide
it to the BL3-x images.
2. Remove meminfo_t and bl31_plat_params_t from all FVP BL3-x
code as the images use link-time information to determine
memory extents.
meminfo_t is still used by common interface in BL1/BL2 for
loading images
Change-Id: I4e825ebf6f515b59d84dc2bdddf6edbf15e2d60f
Diffstat (limited to 'services')
-rw-r--r-- | services/spd/tspd/tspd_main.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index 15f7ffe1..21ff7ffe 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -66,7 +66,7 @@ DEFINE_SVC_UUID(tsp_uuid, 0x5b3056a0, 0x3291, 0x427b, 0x98, 0x11, 0x71, 0x68, 0xca, 0x50, 0xf3, 0xfa); -int32_t tspd_init(meminfo_t *bl32_meminfo); +int32_t tspd_init(void); /******************************************************************************* @@ -126,10 +126,9 @@ int32_t tspd_setup(void) * It also assumes that a valid non-secure context has been initialised by PSCI * so it does not need to save and restore any non-secure state. This function * performs a synchronous entry into the Secure payload. The SP passes control - * back to this routine through a SMC. It also passes the extents of memory made - * available to BL32 by BL31. + * back to this routine through a SMC. ******************************************************************************/ -int32_t tspd_init(meminfo_t *bl32_meminfo) +int32_t tspd_init(void) { uint64_t mpidr = read_mpidr(); uint32_t linear_id = platform_get_core_pos(mpidr); @@ -137,18 +136,6 @@ int32_t tspd_init(meminfo_t *bl32_meminfo) tsp_context_t *tsp_ctx = &tspd_sp_context[linear_id]; /* - * Arrange for passing a pointer to the meminfo structure - * describing the memory extents available to the secure - * payload. - * TODO: We are passing a pointer to BL31 internal memory - * whereas this structure should be copied to a communication - * buffer between the SP and SPD. - */ - write_ctx_reg(get_gpregs_ctx(&tsp_ctx->cpu_ctx), - CTX_GPREG_X0, - (uint64_t) bl32_meminfo); - - /* * Arrange for an entry into the test secure payload. We expect an array * of vectors in return */ |