Fix pointer type mismatch of handlers

Commit 4c0d03907652 ("Rework type usage in Trusted Firmware") changed
the type usage in struct declarations, but did not touch the definition
side.  Fix the type mismatch.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/arm/gic/gic_v3.c b/drivers/arm/gic/gic_v3.c
index 3e802fddb14711143033552e25e59eabf26d88d5..548681791477b1a1d1ab0b1865390fbdd4e65920 100644 (file)
--- a/drivers/arm/gic/gic_v3.c
+++ b/drivers/arm/gic/gic_v3.c
@@ -8,7 +8,7 @@
 #include <debug.h>
 #include <gic_v3.h>
 
-uintptr_t gicv3_get_rdist(uintptr_t gicr_base, uint64_t mpidr)
+uintptr_t gicv3_get_rdist(uintptr_t gicr_base, u_register_t mpidr)
 {
        uint32_t  cpu_aff, gicr_aff;
        uint64_t  gicr_typer;

diff --git a/plat/mediatek/common/custom/oem_svc.c b/plat/mediatek/common/custom/oem_svc.c
index 49e7571ded765de4d22602074353552737aa766b..c396e2d99c8bd4329c0363cae995bd324b9ca817 100644 (file)
--- a/plat/mediatek/common/custom/oem_svc.c
+++ b/plat/mediatek/common/custom/oem_svc.c
@@ -32,14 +32,14 @@ static int32_t oem_svc_setup(void)
 /*******************************************************************************
  * OEM top level handler for servicing SMCs.
  ******************************************************************************/
-uint64_t oem_smc_handler(uint32_t smc_fid,
-                       uint64_t x1,
-                       uint64_t x2,
-                       uint64_t x3,
-                       uint64_t x4,
+uintptr_t oem_smc_handler(uint32_t smc_fid,
+                       u_register_t x1,
+                       u_register_t x2,
+                       u_register_t x3,
+                       u_register_t x4,
                        void *cookie,
                        void *handle,
-                       uint64_t flags)
+                       u_register_t flags)
 {
        WARN("Unimplemented OEM Call: 0x%x\n", smc_fid);
        SMC_RET1(handle, SMC_UNK);
@@ -49,14 +49,14 @@ uint64_t oem_smc_handler(uint32_t smc_fid,
  * Top-level OEM Service SMC handler. This handler will in turn dispatch
  * calls to related SMC handler
  */
-uint64_t oem_svc_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+uintptr_t oem_svc_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        /*
         * Dispatch OEM calls to OEM Common handler and return its return value

diff --git a/plat/mediatek/common/mtk_plat_common.c b/plat/mediatek/common/mtk_plat_common.c
index 6a13192c6ff6199b359ee1e9ae49caee44ae048d..a15131da228c9858f502132d7bc39a7a7cd94eb6 100644 (file)
--- a/plat/mediatek/common/mtk_plat_common.c
+++ b/plat/mediatek/common/mtk_plat_common.c
@@ -19,10 +19,10 @@
 struct atf_arg_t gteearg;
 
 void clean_top_32b_of_param(uint32_t smc_fid,
-                               uint64_t *px1,
-                               uint64_t *px2,
-                               uint64_t *px3,
-                               uint64_t *px4)
+                               u_register_t *px1,
+                               u_register_t *px2,
+                               u_register_t *px3,
+                               u_register_t *px4)
 {
        /* if parameters from SMC32. Clean top 32 bits */
        if (0 == (smc_fid & SMC_AARCH64_BIT)) {

diff --git a/plat/mediatek/common/mtk_plat_common.h b/plat/mediatek/common/mtk_plat_common.h
index 7513bc78eef09c38af265e0c2b92d99f56202e38..501c339bada787d92824a1a68b228b089276916c 100644 (file)
--- a/plat/mediatek/common/mtk_plat_common.h
+++ b/plat/mediatek/common/mtk_plat_common.h
@@ -48,10 +48,10 @@ struct mtk_bl_param_t {
 /* Declarations for mtk_plat_common.c */
 uint32_t plat_get_spsr_for_bl32_entry(void);
 uint32_t plat_get_spsr_for_bl33_entry(void);
-void clean_top_32b_of_param(uint32_t smc_fid, uint64_t *x1,
-                               uint64_t *x2,
-                               uint64_t *x3,
-                               uint64_t *x4);
+void clean_top_32b_of_param(uint32_t smc_fid, u_register_t *x1,
+                               u_register_t *x2,
+                               u_register_t *x3,
+                               u_register_t *x4);
 void bl31_prepare_kernel_entry(uint64_t k32_64);
 void enable_ns_access_to_cpuectlr(void);
 void boot_to_kernel(uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4);

diff --git a/plat/mediatek/common/mtk_sip_svc.c b/plat/mediatek/common/mtk_sip_svc.c
index 869a959048bea585b51bd5c8a610758452bbf5a2..ea8cea0072b6ba1da806e6bfe6ad992a4afe1084 100644 (file)
--- a/plat/mediatek/common/mtk_sip_svc.c
+++ b/plat/mediatek/common/mtk_sip_svc.c
@@ -19,14 +19,14 @@ DEFINE_SVC_UUID(mtk_sip_svc_uid,
                0x8f, 0x95, 0x05, 0x00, 0x0f, 0x3d);
 
 #pragma weak mediatek_plat_sip_handler
-uint64_t mediatek_plat_sip_handler(uint32_t smc_fid,
-                               uint64_t x1,
-                               uint64_t x2,
-                               uint64_t x3,
-                               uint64_t x4,
+uintptr_t mediatek_plat_sip_handler(uint32_t smc_fid,
+                               u_register_t x1,
+                               u_register_t x2,
+                               u_register_t x3,
+                               u_register_t x4,
                                void *cookie,
                                void *handle,
-                               uint64_t flags)
+                               u_register_t flags)
 {
        ERROR("%s: unhandled SMC (0x%x)\n", __func__, smc_fid);
        SMC_RET1(handle, SMC_UNK);
@@ -34,14 +34,14 @@ uint64_t mediatek_plat_sip_handler(uint32_t smc_fid,
 
 /*
  * This function handles Mediatek defined SiP Calls */
-uint64_t mediatek_sip_handler(uint32_t smc_fid,
-                       uint64_t x1,
-                       uint64_t x2,
-                       uint64_t x3,
-                       uint64_t x4,
+uintptr_t mediatek_sip_handler(uint32_t smc_fid,
+                       u_register_t x1,
+                       u_register_t x2,
+                       u_register_t x3,
+                       u_register_t x4,
                        void *cookie,
                        void *handle,
-                       uint64_t flags)
+                       u_register_t flags)
 {
        uint32_t ns;
 
@@ -85,14 +85,14 @@ uint64_t mediatek_sip_handler(uint32_t smc_fid,
 /*
  * This function is responsible for handling all SiP calls from the NS world
  */
-uint64_t sip_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+uintptr_t sip_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        switch (smc_fid) {
        case SIP_SVC_CALL_COUNT:

diff --git a/plat/nvidia/tegra/common/tegra_sip_calls.c b/plat/nvidia/tegra/common/tegra_sip_calls.c
index d96ce7a07a9e2fdfb3ad868a13d52ca60e47104a..a8184531f7b7c68b4670a7ef357cc782daef8fcf 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_sip_calls.c
+++ b/plat/nvidia/tegra/common/tegra_sip_calls.c
@@ -49,14 +49,14 @@ int plat_sip_handler(uint32_t smc_fid,
 /*******************************************************************************
  * This function is responsible for handling all SiP calls
  ******************************************************************************/
-uint64_t tegra_sip_handler(uint32_t smc_fid,
-                          uint64_t x1,
-                          uint64_t x2,
-                          uint64_t x3,
-                          uint64_t x4,
-                          void *cookie,
-                          void *handle,
-                          uint64_t flags)
+uintptr_t tegra_sip_handler(uint32_t smc_fid,
+                           u_register_t x1,
+                           u_register_t x2,
+                           u_register_t x3,
+                           u_register_t x4,
+                           void *cookie,
+                           void *handle,
+                           u_register_t flags)
 {
        uint32_t regval;
        int err;

diff --git a/plat/rockchip/common/rockchip_sip_svc.c b/plat/rockchip/common/rockchip_sip_svc.c
index eca4f99accf834a3e28f98c94b07ddac1d386859..24805994b090f3a41f450a8deb159f61e9a13786 100644 (file)
--- a/plat/rockchip/common/rockchip_sip_svc.c
+++ b/plat/rockchip/common/rockchip_sip_svc.c
@@ -18,14 +18,14 @@ DEFINE_SVC_UUID(rk_sip_svc_uid,
                0x8f, 0x88, 0xee, 0x74, 0x7b, 0x72);
 
 #pragma weak rockchip_plat_sip_handler
-uint64_t rockchip_plat_sip_handler(uint32_t smc_fid,
-                                  uint64_t x1,
-                                  uint64_t x2,
-                                  uint64_t x3,
-                                  uint64_t x4,
-                                  void *cookie,
-                                  void *handle,
-                                  uint64_t flags)
+uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid,
+                                   u_register_t x1,
+                                   u_register_t x2,
+                                   u_register_t x3,
+                                   u_register_t x4,
+                                   void *cookie,
+                                   void *handle,
+                                   u_register_t flags)
 {
        ERROR("%s: unhandled SMC (0x%x)\n", __func__, smc_fid);
        SMC_RET1(handle, SMC_UNK);
@@ -34,14 +34,14 @@ uint64_t rockchip_plat_sip_handler(uint32_t smc_fid,
 /*
  * This function is responsible for handling all SiP calls from the NS world
  */
-uint64_t sip_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
-                        void *cookie,
-                        void *handle,
-                        uint64_t flags)
+uintptr_t sip_smc_handler(uint32_t smc_fid,
+                         u_register_t x1,
+                         u_register_t x2,
+                         u_register_t x3,
+                         u_register_t x4,
+                         void *cookie,
+                         void *handle,
+                         u_register_t flags)
 {
        uint32_t ns;
 

diff --git a/plat/rockchip/rk3368/plat_sip_calls.c b/plat/rockchip/rk3368/plat_sip_calls.c
index 03fee88cbc7f8a6781b79725d6748df17bf2d2f5..c0f43dbfc0a92b955192ee125f84786cdf67adc3 100644 (file)
--- a/plat/rockchip/rk3368/plat_sip_calls.c
+++ b/plat/rockchip/rk3368/plat_sip_calls.c
@@ -10,14 +10,14 @@
 #include <rockchip_sip_svc.h>
 #include <runtime_svc.h>
 
-uint64_t rockchip_plat_sip_handler(uint32_t smc_fid,
-                                  uint64_t x1,
-                                  uint64_t x2,
-                                  uint64_t x3,
-                                  uint64_t x4,
+uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid,
+                                  u_register_t x1,
+                                  u_register_t x2,
+                                  u_register_t x3,
+                                  u_register_t x4,
                                   void *cookie,
                                   void *handle,
-                                  uint64_t flags)
+                                  u_register_t flags)
 {
        ERROR("%s: unhandled SMC (0x%x)\n", __func__, smc_fid);
        SMC_RET1(handle, SMC_UNK);

diff --git a/plat/rockchip/rk3399/plat_sip_calls.c b/plat/rockchip/rk3399/plat_sip_calls.c
index 2fbda67300820453fa50729aac5da988217f9e6e..ae74c9c405e463febedd2c80d8d548a2487831d4 100644 (file)
--- a/plat/rockchip/rk3399/plat_sip_calls.c
+++ b/plat/rockchip/rk3399/plat_sip_calls.c
@@ -47,14 +47,14 @@ uint32_t ddr_smc_handler(uint64_t arg0, uint64_t arg1,
        return 0;
 }
 
-uint64_t rockchip_plat_sip_handler(uint32_t smc_fid,
-                                  uint64_t x1,
-                                  uint64_t x2,
-                                  uint64_t x3,
-                                  uint64_t x4,
-                                  void *cookie,
-                                  void *handle,
-                                  uint64_t flags)
+uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid,
+                                   u_register_t x1,
+                                   u_register_t x2,
+                                   u_register_t x3,
+                                   u_register_t x4,
+                                   void *cookie,
+                                   void *handle,
+                                   u_register_t flags)
 {
        uint64_t x5, x6;
 

diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c
index 8b44eaa8dc1cc56f8a93eef3469afe76604490f6..c7996ce7ea7ceb6c523dbced910f098c9522209b 100644 (file)
--- a/plat/xilinx/zynqmp/sip_svc_setup.c
+++ b/plat/xilinx/zynqmp/sip_svc_setup.c
@@ -52,14 +52,14 @@ static int32_t sip_svc_setup(void)
  * Handler for all SiP SMC calls. Handles standard SIP requests
  * and calls PM SMC handler if the call is for a PM-API function.
  */
-uint64_t sip_svc_smc_handler(uint32_t smc_fid,
-                            uint64_t x1,
-                            uint64_t x2,
-                            uint64_t x3,
-                            uint64_t x4,
-                            void *cookie,
-                            void *handle,
-                            uint64_t flags)
+uintptr_t sip_svc_smc_handler(uint32_t smc_fid,
+                             u_register_t x1,
+                             u_register_t x2,
+                             u_register_t x3,
+                             u_register_t x4,
+                             void *cookie,
+                             void *handle,
+                             u_register_t flags)
 {
        /* Let PM SMC handler deal with PM-related requests */
        if (is_pm_fid(smc_fid)) {

diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c
index a9e4ece2d0567cf7ac5b27ae195c00e7223fd779..ac58e047c987f71e1dd4afeb3d6bb582b179263a 100644 (file)
--- a/services/spd/opteed/opteed_main.c
+++ b/services/spd/opteed/opteed_main.c
@@ -187,14 +187,14 @@ static int32_t opteed_init(void)
  * state. Lastly it will also return any information that OPTEE needs to do
  * the work assigned to it.
  ******************************************************************************/
-static uint64_t opteed_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+static uintptr_t opteed_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        cpu_context_t *ns_cpu_context;
        uint32_t linear_id = plat_my_core_pos();

diff --git a/services/spd/opteed/opteed_pm.c b/services/spd/opteed/opteed_pm.c
index 2420b1e8f4f0ac7b29529d73599b560d90553acd..7efc234b2979f9fc96d9ba00eefd742efa4a5367 100644 (file)
--- a/services/spd/opteed/opteed_pm.c
+++ b/services/spd/opteed/opteed_pm.c
@@ -16,7 +16,7 @@
  * The target cpu is being turned on. Allow the OPTEED/OPTEE to perform any
  * actions needed. Nothing at the moment.
  ******************************************************************************/
-static void opteed_cpu_on_handler(uint64_t target_cpu)
+static void opteed_cpu_on_handler(u_register_t target_cpu)
 {
 }
 
@@ -24,7 +24,7 @@ static void opteed_cpu_on_handler(uint64_t target_cpu)
  * This cpu is being turned off. Allow the OPTEED/OPTEE to perform any actions
  * needed
  ******************************************************************************/
-static int32_t opteed_cpu_off_handler(uint64_t unused)
+static int32_t opteed_cpu_off_handler(u_register_t unused)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -57,7 +57,7 @@ static int32_t opteed_cpu_off_handler(uint64_t unused)
  * This cpu is being suspended. S-EL1 state must have been saved in the
  * resident cpu (mpidr format) if it is a UP/UP migratable OPTEE.
  ******************************************************************************/
-static void opteed_cpu_suspend_handler(uint64_t max_off_pwrlvl)
+static void opteed_cpu_suspend_handler(u_register_t max_off_pwrlvl)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -87,7 +87,7 @@ static void opteed_cpu_suspend_handler(uint64_t max_off_pwrlvl)
  * after initialising minimal architectural state that guarantees safe
  * execution.
  ******************************************************************************/
-static void opteed_cpu_on_finish_handler(uint64_t unused)
+static void opteed_cpu_on_finish_handler(u_register_t unused)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -123,7 +123,7 @@ static void opteed_cpu_on_finish_handler(uint64_t unused)
  * completed the preceding suspend call. Use that context to program an entry
  * into OPTEE to allow it to do any remaining book keeping
  ******************************************************************************/
-static void opteed_cpu_suspend_finish_handler(uint64_t max_off_pwrlvl)
+static void opteed_cpu_suspend_finish_handler(u_register_t max_off_pwrlvl)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -154,7 +154,7 @@ static void opteed_cpu_suspend_finish_handler(uint64_t max_off_pwrlvl)
  * Return the type of OPTEE the OPTEED is dealing with. Report the current
  * resident cpu (mpidr format) if it is a UP/UP migratable OPTEE.
  ******************************************************************************/
-static int32_t opteed_cpu_migrate_info(uint64_t *resident_cpu)
+static int32_t opteed_cpu_migrate_info(u_register_t *resident_cpu)
 {
        return OPTEE_MIGRATE_INFO;
 }

diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c
index 961fd18257e535f9eb652b6e7ac7d4025aa66c7a..5090f063fefe071edf79e38a591a2274464831c1 100644 (file)
--- a/services/spd/tlkd/tlkd_main.c
+++ b/services/spd/tlkd/tlkd_main.c
@@ -133,14 +133,14 @@ static int32_t tlkd_init(void)
  * will also return any information that the secure payload needs to do the
  * work assigned to it.
  ******************************************************************************/
-static uint64_t tlkd_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+static uintptr_t tlkd_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        cpu_context_t *ns_cpu_context;
        gp_regs_t *gp_regs;

diff --git a/services/spd/tlkd/tlkd_pm.c b/services/spd/tlkd/tlkd_pm.c
index 8b4c457745ae5e1cfa31e751fbaccd4c6385de05..2cd2fbbe799cf3ff2142b9fbaa94e958645c3990 100644 (file)
--- a/services/spd/tlkd/tlkd_pm.c
+++ b/services/spd/tlkd/tlkd_pm.c
@@ -22,7 +22,7 @@ extern tlk_context_t tlk_ctx;
  * Return the type of payload TLKD is dealing with. Report the current
  * resident cpu (mpidr format) if it is a UP/UP migratable payload.
  ******************************************************************************/
-static int32_t cpu_migrate_info(uint64_t *resident_cpu)
+static int32_t cpu_migrate_info(u_register_t *resident_cpu)
 {
        /* the payload runs only on CPU0 */
        *resident_cpu = MPIDR_CPU0;
@@ -35,7 +35,7 @@ static int32_t cpu_migrate_info(uint64_t *resident_cpu)
  * This cpu is being suspended. Inform TLK of the SYSTEM_SUSPEND event, so
  * that it can pass this information to its Trusted Apps.
  ******************************************************************************/
-static void cpu_suspend_handler(uint64_t suspend_level)
+static void cpu_suspend_handler(u_register_t suspend_level)
 {
        gp_regs_t *gp_regs;
        int cpu = read_mpidr() & MPIDR_CPU_MASK;
@@ -67,7 +67,7 @@ static void cpu_suspend_handler(uint64_t suspend_level)
  * This cpu is being resumed. Inform TLK of the SYSTEM_SUSPEND exit, so
  * that it can pass this information to its Trusted Apps.
  ******************************************************************************/
-static void cpu_resume_handler(uint64_t suspend_level)
+static void cpu_resume_handler(u_register_t suspend_level)
 {
        gp_regs_t *gp_regs;
        int cpu = read_mpidr() & MPIDR_CPU_MASK;

diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index f5501c92443f8298350d978346d1472cb4ecd516..48a2611bd5d3131915c1b6af86116ad7f3dd0849 100644 (file)
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -212,14 +212,14 @@ static uint64_t trusty_fiq_exit(void *handle, uint64_t x1, uint64_t x2, uint64_t
        SMC_RET0(handle);
 }
 
-static uint64_t trusty_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+static uintptr_t trusty_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        struct args ret;
        uint32_t vmid = 0;
@@ -347,14 +347,14 @@ static void trusty_cpu_resume(uint32_t on)
        }
 }
 
-static int32_t trusty_cpu_off_handler(uint64_t unused)
+static int32_t trusty_cpu_off_handler(u_register_t unused)
 {
        trusty_cpu_suspend(1);
 
        return 0;
 }
 
-static void trusty_cpu_on_finish_handler(uint64_t unused)
+static void trusty_cpu_on_finish_handler(u_register_t unused)
 {
        struct trusty_cpu_ctx *ctx = get_trusty_ctx();
 
@@ -365,12 +365,12 @@ static void trusty_cpu_on_finish_handler(uint64_t unused)
        }
 }
 
-static void trusty_cpu_suspend_handler(uint64_t unused)
+static void trusty_cpu_suspend_handler(u_register_t unused)
 {
        trusty_cpu_suspend(0);
 }
 
-static void trusty_cpu_suspend_finish_handler(uint64_t unused)
+static void trusty_cpu_suspend_finish_handler(u_register_t unused)
 {
        trusty_cpu_resume(0);
 }

diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c
index 279da987ceab3a4d981403094c7e58407f8aa7f1..8cb23b966153615576e0fc1897995abc80183472 100644 (file)
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -273,14 +273,14 @@ int32_t tspd_init(void)
  * will also return any information that the secure payload needs to do the
  * work assigned to it.
  ******************************************************************************/
-static uint64_t tspd_smc_handler(uint32_t smc_fid,
-                        uint64_t x1,
-                        uint64_t x2,
-                        uint64_t x3,
-                        uint64_t x4,
+static uintptr_t tspd_smc_handler(uint32_t smc_fid,
+                        u_register_t x1,
+                        u_register_t x2,
+                        u_register_t x3,
+                        u_register_t x4,
                         void *cookie,
                         void *handle,
-                        uint64_t flags)
+                        u_register_t flags)
 {
        cpu_context_t *ns_cpu_context;
        uint32_t linear_id = plat_my_core_pos(), ns;

diff --git a/services/spd/tspd/tspd_pm.c b/services/spd/tspd/tspd_pm.c
index 5fdd3dc1cedb936a1c492e103f113b08b8ceed54..9414c154e5b78edd3e4f9b0812a283dc023150b8 100644 (file)
--- a/services/spd/tspd/tspd_pm.c
+++ b/services/spd/tspd/tspd_pm.c
@@ -17,7 +17,7 @@
  * The target cpu is being turned on. Allow the TSPD/TSP to perform any actions
  * needed. Nothing at the moment.
  ******************************************************************************/
-static void tspd_cpu_on_handler(uint64_t target_cpu)
+static void tspd_cpu_on_handler(u_register_t target_cpu)
 {
 }
 
@@ -25,7 +25,7 @@ static void tspd_cpu_on_handler(uint64_t target_cpu)
  * This cpu is being turned off. Allow the TSPD/TSP to perform any actions
  * needed
  ******************************************************************************/
-static int32_t tspd_cpu_off_handler(uint64_t unused)
+static int32_t tspd_cpu_off_handler(u_register_t unused)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -64,7 +64,7 @@ static int32_t tspd_cpu_off_handler(uint64_t unused)
  * This cpu is being suspended. S-EL1 state must have been saved in the
  * resident cpu (mpidr format) if it is a UP/UP migratable TSP.
  ******************************************************************************/
-static void tspd_cpu_suspend_handler(uint64_t max_off_pwrlvl)
+static void tspd_cpu_suspend_handler(u_register_t max_off_pwrlvl)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -100,7 +100,7 @@ static void tspd_cpu_suspend_handler(uint64_t max_off_pwrlvl)
  * after initialising minimal architectural state that guarantees safe
  * execution.
  ******************************************************************************/
-static void tspd_cpu_on_finish_handler(uint64_t unused)
+static void tspd_cpu_on_finish_handler(u_register_t unused)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -145,7 +145,7 @@ static void tspd_cpu_on_finish_handler(uint64_t unused)
  * completed the preceding suspend call. Use that context to program an entry
  * into the TSP to allow it to do any remaining book keeping
  ******************************************************************************/
-static void tspd_cpu_suspend_finish_handler(uint64_t max_off_pwrlvl)
+static void tspd_cpu_suspend_finish_handler(u_register_t max_off_pwrlvl)
 {
        int32_t rc = 0;
        uint32_t linear_id = plat_my_core_pos();
@@ -176,7 +176,7 @@ static void tspd_cpu_suspend_finish_handler(uint64_t max_off_pwrlvl)
  * Return the type of TSP the TSPD is dealing with. Report the current resident
  * cpu (mpidr format) if it is a UP/UP migratable TSP.
  ******************************************************************************/
-static int32_t tspd_cpu_migrate_info(uint64_t *resident_cpu)
+static int32_t tspd_cpu_migrate_info(u_register_t *resident_cpu)
 {
        return TSP_MIGRATE_INFO;
 }