From 1f37b9442fa47af519eabd2f5b67fdaeb1ddfa64 Mon Sep 17 00:00:00 2001 From: Dan Handley Date: Tue, 15 Dec 2015 14:28:24 +0000 Subject: FWU: Pass client cookie to FWU_SMC_UPDATE_DONE The current FWU_SMC_UPDATE_DONE implementation incorrectly passes an unused framework cookie through to the 1st argument in the platform function `bl1_plat_fwu_done`. The intent is to allow the SMC caller to pass a cookie through to this function. This patch fixes FWU_SMC_UPDATE_DONE to pass x1 from the caller through to `bl1_plat_fwu_done`. The argument names are updated for clarity. Upstream platforms currently do not use this argument so no impact is expected. Change-Id: I107f4b51eb03e7394f66d9a534ffab1cbc09a9b2 --- bl1/bl1_fwu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bl1') diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 05759212..5e8ee8e3 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -64,7 +64,7 @@ static register_t bl1_fwu_image_resume(unsigned int image_id, unsigned int flags); static int bl1_fwu_sec_image_done(void **handle, unsigned int flags); -__dead2 static void bl1_fwu_done(void *cookie, void *reserved); +__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved); /* * This keeps track of last executed secure image id. @@ -101,7 +101,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid, SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags)); case FWU_SMC_UPDATE_DONE: - bl1_fwu_done(cookie, NULL); + bl1_fwu_done((void *)x1, NULL); /* We should never return from bl1_fwu_done() */ default: @@ -492,13 +492,13 @@ static int bl1_fwu_sec_image_done(void **handle, unsigned int flags) * This function provides the opportunity for users to perform any * platform specific handling after the Firmware update is done. ******************************************************************************/ -__dead2 static void bl1_fwu_done(void *cookie, void *reserved) +__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved) { NOTICE("BL1-FWU: *******FWU Process Completed*******\n"); /* * Call platform done function. */ - bl1_plat_fwu_done(cookie, reserved); + bl1_plat_fwu_done(client_cookie, reserved); assert(0); } -- cgit v1.2.3