diff options
Diffstat (limited to 'plat/mediatek/common')
| -rw-r--r-- | plat/mediatek/common/custom/oem_svc.c | 24 | ||||
| -rw-r--r-- | plat/mediatek/common/mtk_plat_common.c | 8 | ||||
| -rw-r--r-- | plat/mediatek/common/mtk_plat_common.h | 8 | ||||
| -rw-r--r-- | plat/mediatek/common/mtk_sip_svc.c | 36 |
4 files changed, 38 insertions, 38 deletions
diff --git a/plat/mediatek/common/custom/oem_svc.c b/plat/mediatek/common/custom/oem_svc.c index 49e7571d..c396e2d9 100644 --- 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 6a13192c..a15131da 100644 --- 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 7513bc78..501c339b 100644 --- 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 869a9590..ea8cea00 100644 --- 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: |