From b659b1a755a4a73479137ca4b37f55ccba1dbde1 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Wed, 11 May 2016 18:04:09 +0800 Subject: mt8173: Reorganize plat SiP functions Due to the changes in Mediatek platform common code, we need to move plat related SiP functions to plat folder. Change-Id: I6b14b988235205a5858b4bf49043bc79d0512b06 Signed-off-by: Jimmy Huang --- plat/mediatek/common/mtk_sip_svc.c | 4 ++- plat/mediatek/common/mtk_sip_svc.h | 9 ++---- plat/mediatek/mt8173/include/plat_sip_calls.h | 43 +++++++++++++++++++++++++++ plat/mediatek/mt8173/plat_sip_calls.c | 41 +++++++++++++++++++++++-- 4 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 plat/mediatek/mt8173/include/plat_sip_calls.h (limited to 'plat/mediatek') diff --git a/plat/mediatek/common/mtk_sip_svc.c b/plat/mediatek/common/mtk_sip_svc.c index 65916599..021511e0 100644 --- a/plat/mediatek/common/mtk_sip_svc.c +++ b/plat/mediatek/common/mtk_sip_svc.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -117,7 +118,8 @@ uint64_t sip_smc_handler(uint32_t smc_fid, switch (smc_fid) { case SIP_SVC_CALL_COUNT: /* Return the number of Mediatek SiP Service Calls. */ - SMC_RET1(handle, MTK_SIP_NUM_CALLS); + SMC_RET1(handle, + MTK_COMMON_SIP_NUM_CALLS + MTK_PLAT_SIP_NUM_CALLS); case SIP_SVC_UID: /* Return UID to the caller */ diff --git a/plat/mediatek/common/mtk_sip_svc.h b/plat/mediatek/common/mtk_sip_svc.h index 91252d16..703e49af 100644 --- a/plat/mediatek/common/mtk_sip_svc.h +++ b/plat/mediatek/common/mtk_sip_svc.h @@ -45,13 +45,10 @@ #define SMC_AARCH64_BIT 0x40000000 /* Number of Mediatek SiP Calls implemented */ -#define MTK_SIP_NUM_CALLS 4 +#define MTK_COMMON_SIP_NUM_CALLS 4 /* Mediatek SiP Service Calls function IDs */ #define MTK_SIP_SET_AUTHORIZED_SECURE_REG 0x82000001 -#define MTK_SIP_PWR_ON_MTCMOS 0x82000402 -#define MTK_SIP_PWR_OFF_MTCMOS 0x82000403 -#define MTK_SIP_PWR_MTCMOS_SUPPORT 0x82000404 /* For MTK SMC from Secure OS */ /* 0x82000000 - 0x820000FF & 0xC2000000 - 0xC20000FF */ @@ -76,7 +73,5 @@ enum { * Return MTK_SIP_E_SUCCESS on success, and MTK_SIP_E_INVALID_PARAM on failure. */ uint64_t mt_sip_set_authorized_sreg(uint32_t sreg, uint32_t val); -uint64_t mt_sip_pwr_on_mtcmos(uint32_t val); -uint64_t mt_sip_pwr_off_mtcmos(uint32_t val); -uint64_t mt_sip_pwr_mtcmos_support(void); + #endif /* __PLAT_SIP_SVC_H__ */ diff --git a/plat/mediatek/mt8173/include/plat_sip_calls.h b/plat/mediatek/mt8173/include/plat_sip_calls.h new file mode 100644 index 00000000..c94458d7 --- /dev/null +++ b/plat/mediatek/mt8173/include/plat_sip_calls.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of ARM nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __PLAT_SIP_CALLS_H__ +#define __PLAT_SIP_CALLS_H__ + +/******************************************************************************* + * Plat SiP function constants + ******************************************************************************/ +#define MTK_PLAT_SIP_NUM_CALLS 3 + +#define MTK_SIP_PWR_ON_MTCMOS 0x82000402 +#define MTK_SIP_PWR_OFF_MTCMOS 0x82000403 +#define MTK_SIP_PWR_MTCMOS_SUPPORT 0x82000404 + +#endif /* __PLAT_SIP_CALLS_H__ */ diff --git a/plat/mediatek/mt8173/plat_sip_calls.c b/plat/mediatek/mt8173/plat_sip_calls.c index e12892f0..c9719e97 100644 --- a/plat/mediatek/mt8173/plat_sip_calls.c +++ b/plat/mediatek/mt8173/plat_sip_calls.c @@ -27,9 +27,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include +#include +#include /* Authorized secure register list */ enum { @@ -57,7 +60,7 @@ uint64_t mt_sip_set_authorized_sreg(uint32_t sreg, uint32_t val) return MTK_SIP_E_INVALID_PARAM; } -uint64_t mt_sip_pwr_on_mtcmos(uint32_t val) +static uint64_t mt_sip_pwr_on_mtcmos(uint32_t val) { uint32_t ret; @@ -68,7 +71,7 @@ uint64_t mt_sip_pwr_on_mtcmos(uint32_t val) return MTK_SIP_E_SUCCESS; } -uint64_t mt_sip_pwr_off_mtcmos(uint32_t val) +static uint64_t mt_sip_pwr_off_mtcmos(uint32_t val) { uint32_t ret; @@ -79,7 +82,39 @@ uint64_t mt_sip_pwr_off_mtcmos(uint32_t val) return MTK_SIP_E_SUCCESS; } -uint64_t mt_sip_pwr_mtcmos_support(void) +static uint64_t mt_sip_pwr_mtcmos_support(void) { return MTK_SIP_E_SUCCESS; } + +uint64_t mediatek_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) +{ + uint64_t ret; + + switch (smc_fid) { + case MTK_SIP_PWR_ON_MTCMOS: + ret = mt_sip_pwr_on_mtcmos((uint32_t)x1); + SMC_RET1(handle, ret); + + case MTK_SIP_PWR_OFF_MTCMOS: + ret = mt_sip_pwr_off_mtcmos((uint32_t)x1); + SMC_RET1(handle, ret); + + case MTK_SIP_PWR_MTCMOS_SUPPORT: + ret = mt_sip_pwr_mtcmos_support(); + SMC_RET1(handle, ret); + + default: + ERROR("%s: unhandled SMC (0x%x)\n", __func__, smc_fid); + break; + } + + SMC_RET1(handle, SMC_UNK); +} -- cgit v1.2.3