diff options
author | Ashutosh Singh <ashutosh.singh@arm.com> | 2016-03-31 17:18:34 +0100 |
---|---|---|
committer | Ashutosh Singh <ashutosh.singh@arm.com> | 2016-04-01 16:46:56 +0100 |
commit | 56a6412de86537d3445e36a5a81f515fa2c683a7 (patch) | |
tree | b029a438bd5b7180e636e81a9c1f36afb2e59c2b /services/spd/opteed | |
parent | 6b1ca8f35802fddc530e1a5f2be7b82ddbab6917 (diff) |
pass r0-r6 as part of smc param
In new communication protocol between optee os and linux driver,
r0-r6 registers are used. opteed need to copy these registers
as well when optee context registers are initialized.
Change-Id: Ifb47b73f847c61746cb58ea78411c1c71f208030
Signed-off-by: Ashutosh Singh <ashutosh.singh@arm.com>
Diffstat (limited to 'services/spd/opteed')
-rw-r--r-- | services/spd/opteed/opteed_main.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c index 7796fc4a..6b4b14af 100644 --- a/services/spd/opteed/opteed_main.c +++ b/services/spd/opteed/opteed_main.c @@ -265,6 +265,18 @@ uint64_t opteed_smc_handler(uint32_t smc_fid, cm_el1_sysregs_context_restore(SECURE); cm_set_next_eret_context(SECURE); + write_ctx_reg(get_gpregs_ctx(&optee_ctx->cpu_ctx), + CTX_GPREG_X4, + read_ctx_reg(get_gpregs_ctx(handle), + CTX_GPREG_X4)); + write_ctx_reg(get_gpregs_ctx(&optee_ctx->cpu_ctx), + CTX_GPREG_X5, + read_ctx_reg(get_gpregs_ctx(handle), + CTX_GPREG_X5)); + write_ctx_reg(get_gpregs_ctx(&optee_ctx->cpu_ctx), + CTX_GPREG_X6, + read_ctx_reg(get_gpregs_ctx(handle), + CTX_GPREG_X6)); /* Propagate hypervisor client ID */ write_ctx_reg(get_gpregs_ctx(&optee_ctx->cpu_ctx), CTX_GPREG_X7, |