andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #470 from danh-arm/dh/fwu-done-fix 

FWU: Pass client cookie to FWU_SMC_UPDATE_DONE
This commit is contained in:
danh-arm 2015-12-15 16:12:10 +00:00
parent e551c5bf42 1f37b9442f
commit 9831154f55
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bl1/bl1_fwu.c
View File

@ -63,7 +63,7 @@ static register_t bl1_fwu_image_resume(register_t image_param,
unsigned int flags); unsigned int flags);
static int bl1_fwu_sec_image_done(void **handle, static int bl1_fwu_sec_image_done(void **handle,
unsigned int flags); 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. * This keeps track of last executed secure image id.
@ -100,7 +100,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid,
SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags)); SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags));
case FWU_SMC_UPDATE_DONE: case FWU_SMC_UPDATE_DONE:
bl1_fwu_done(cookie, NULL); bl1_fwu_done((void *)x1, NULL);
/* We should never return from bl1_fwu_done() */ /* We should never return from bl1_fwu_done() */
default: default:
@ -495,13 +495,13 @@ static int bl1_fwu_sec_image_done(void **handle, unsigned int flags)
* This function provides the opportunity for users to perform any * This function provides the opportunity for users to perform any
* platform specific handling after the Firmware update is done. * 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"); NOTICE("BL1-FWU: *******FWU Process Completed*******\n");
/* /*
* Call platform done function. * Call platform done function.
*/ */
bl1_plat_fwu_done(cookie, reserved); bl1_plat_fwu_done(client_cookie, reserved);
assert(0); assert(0);
} }

2
include/plat/common/platform.h
View File

@ -121,7 +121,7 @@ struct image_desc *bl1_plat_get_image_desc(unsigned int image_id);
* The following functions are used by firmware update * The following functions are used by firmware update
* feature and may optionally be overridden. * feature and may optionally be overridden.
*/ */
__dead2 void bl1_plat_fwu_done(void *cookie, void *reserved); __dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved);
/******************************************************************************* /*******************************************************************************

2
plat/arm/board/juno/juno_bl1_setup.c
View File

@ -72,7 +72,7 @@ void bl1_plat_set_ep_info(unsigned int image_id,
/******************************************************************************* /*******************************************************************************
* On Juno clear SYS_NVFLAGS and wait for watchdog reset. * On Juno clear SYS_NVFLAGS and wait for watchdog reset.
******************************************************************************/ ******************************************************************************/
__dead2 void bl1_plat_fwu_done(void *cookie, void *rsvd_ptr) __dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved)
{ {
unsigned int *nv_flags_clr = (unsigned int *) unsigned int *nv_flags_clr = (unsigned int *)
(V2M_SYSREGS_BASE + V2M_SYS_NVFLAGSCLR); (V2M_SYSREGS_BASE + V2M_SYS_NVFLAGSCLR);

2
plat/common/plat_bl1_common.c
View File

@ -69,7 +69,7 @@ image_desc_t *bl1_plat_get_image_desc(unsigned int image_id)
return &bl2_img_desc; return &bl2_img_desc;
} }
__dead2 void bl1_plat_fwu_done(void *cookie, void *rsvd_ptr) __dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved)
{ {
while (1) while (1)
wfi(); wfi();