erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: fix smc bugs in secmon

Browse source 
Two things:
1. Not returning once setting the return state.
2. mempcy(x, y, ARRAY_SIZE(x)) is not memcpy(x, y, sizeof(x))

With these 2 changes arguments and results are being processed
correctly.

BUG=chrome-os-partner:32112
BRANCH=None
TEST=Built and brought up SMP using PSCI.

Change-Id: I656b9c11e3bc07cc1664789a600eb88afd639f93
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/218847
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Aaron Durbin 2014-09-19 17:08:20 -05:00 • committed by chrome-internal-fetch
commit 42d540afd4
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/arch/arm64/armv8/secmon/smc.c
View file

@ -84,7 +84,7 @@ int smc_register_range(uint32_t min, uint32_t max, int (*h)(struct smc_call *))
static int smc_cleanup(struct exc_state *state, struct smc_call *smc, int ret)
{
memcpy(&state->regs.x, &smc->results, ARRAY_SIZE(smc->results));
memcpy(&state->regs.x, &smc->results, sizeof(smc->results));
return ret;
}
@ -103,15 +103,15 @@ static int smc_handler(struct exc_state *state, uint64_t vector_id)
uint32_t esr;
struct smc_range *r;
memcpy(&smc->args, &state->regs.x, ARRAY_SIZE(smc->args));
memcpy(&smc->results, &state->regs.x, ARRAY_SIZE(smc->results));
memcpy(&smc->args, &state->regs.x, sizeof(smc->args));
memcpy(&smc->results, &state->regs.x, sizeof(smc->results));
esr = raw_read_esr_el3();
exception_class = (esr >> 26) & 0x3f;
/* No support for 32-bit SMC calls. */
if (exception_class == EC_SMC32)
smc_return_with_error(state, smc);
return smc_return_with_error(state, smc);
/* Check to ensure this is an SMC from aarch64. */
if (exception_class != EC_SMC64)
@ -119,7 +119,7 @@ static int smc_handler(struct exc_state *state, uint64_t vector_id)
/* Ensure immediate value is 0. */
if ((esr & 0xffff) != 0)
smc_return_with_error(state, smc);
return smc_return_with_error(state, smc);
r = smc_handler_by_function(smc_function_id(smc));