From 88005701ece84522f419d8176460f7e9d9ea7240 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 6 Feb 2020 14:34:44 +0100 Subject: [PATCH] plat/arm: Pass cookie argument down to arm_get_rotpk_info() The cookie will be leveraged in the next commit. Change-Id: Ie8bad275d856d84c27466461cf815529dd860446 Signed-off-by: Sandrine Bailleux --- include/plat/arm/common/plat_arm.h | 2 +- plat/arm/board/common/board_arm_trusted_boot.c | 2 +- plat/arm/board/fvp/fvp_trusted_boot.c | 2 +- plat/arm/board/rde1edge/rde1edge_trusted_boot.c | 2 +- plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c | 2 +- plat/arm/board/sgi575/sgi575_trusted_boot.c | 2 +- plat/arm/board/sgm775/sgm775_trusted_boot.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 025a64fa2..45c099f1b 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -262,7 +262,7 @@ __dead2 void plat_arm_error_handler(int err); * Optional functions in ARM standard platforms */ void plat_arm_override_gicr_frames(const uintptr_t *plat_gicr_frames); -int arm_get_rotpk_info(void **key_ptr, unsigned int *key_len, +int arm_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags); int arm_get_rotpk_info_regs(void **key_ptr, unsigned int *key_len, unsigned int *flags); diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c index 3c19230bd..e3651f5f4 100644 --- a/plat/arm/board/common/board_arm_trusted_boot.c +++ b/plat/arm/board/common/board_arm_trusted_boot.c @@ -110,7 +110,7 @@ int arm_get_rotpk_info_cc(void **key_ptr, unsigned int *key_len, /* * Wraper function for most Arm platforms to get ROTPK hash. */ -int arm_get_rotpk_info(void **key_ptr, unsigned int *key_len, +int arm_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { #if ARM_CRYPTOCELL_INTEG diff --git a/plat/arm/board/fvp/fvp_trusted_boot.c b/plat/arm/board/fvp/fvp_trusted_boot.c index a09b80e10..8825198a1 100644 --- a/plat/arm/board/fvp/fvp_trusted_boot.c +++ b/plat/arm/board/fvp/fvp_trusted_boot.c @@ -30,7 +30,7 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { - return arm_get_rotpk_info(key_ptr, key_len, flags); + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); } /* diff --git a/plat/arm/board/rde1edge/rde1edge_trusted_boot.c b/plat/arm/board/rde1edge/rde1edge_trusted_boot.c index c271f7f2d..4592b8fba 100644 --- a/plat/arm/board/rde1edge/rde1edge_trusted_boot.c +++ b/plat/arm/board/rde1edge/rde1edge_trusted_boot.c @@ -22,5 +22,5 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { - return arm_get_rotpk_info(key_ptr, key_len, flags); + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); } diff --git a/plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c b/plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c index c271f7f2d..4592b8fba 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c +++ b/plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c @@ -22,5 +22,5 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { - return arm_get_rotpk_info(key_ptr, key_len, flags); + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); } diff --git a/plat/arm/board/sgi575/sgi575_trusted_boot.c b/plat/arm/board/sgi575/sgi575_trusted_boot.c index c271f7f2d..4592b8fba 100644 --- a/plat/arm/board/sgi575/sgi575_trusted_boot.c +++ b/plat/arm/board/sgi575/sgi575_trusted_boot.c @@ -22,5 +22,5 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { - return arm_get_rotpk_info(key_ptr, key_len, flags); + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); } diff --git a/plat/arm/board/sgm775/sgm775_trusted_boot.c b/plat/arm/board/sgm775/sgm775_trusted_boot.c index c271f7f2d..4592b8fba 100644 --- a/plat/arm/board/sgm775/sgm775_trusted_boot.c +++ b/plat/arm/board/sgm775/sgm775_trusted_boot.c @@ -22,5 +22,5 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int *flags) { - return arm_get_rotpk_info(key_ptr, key_len, flags); + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); }