Commit abcc9539 authored by Ye Li's avatar Ye Li
Browse files

MLK-17044-1 imx-common: Adding new argument for SIP call interface



Need to pass total 5 arguments for SIP HAB call, so update the interface
to add new argument.
Signed-off-by: default avatarYe Li <ye.li@nxp.com>
parent 5d48b343
......@@ -688,7 +688,7 @@ static void acquire_buildinfo(void)
}
/* Get ARM Trusted Firmware commit id */
atf_commit = call_imx_sip(FSL_SIP_BUILDINFO, FSL_SIP_BUILDINFO_GET_COMMITHASH, 0, 0);
atf_commit = call_imx_sip(FSL_SIP_BUILDINFO, FSL_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
if (atf_commit == 0xffffffff) {
debug("ATF does not support build info\n");
atf_commit = 0x30; /* Display 0, 0 ascii is 0x30 */
......
......@@ -298,14 +298,14 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
writel(pc, M4_BOOTROM_BASE_ADDR + 4);
/* Enable M4 */
call_imx_sip(FSL_SIP_SRC, FSL_SIP_SRC_M4_START, 0, 0);
call_imx_sip(FSL_SIP_SRC, FSL_SIP_SRC_M4_START, 0, 0, 0);
return 0;
}
int arch_auxiliary_core_check_up(u32 core_id)
{
return call_imx_sip(FSL_SIP_SRC, FSL_SIP_SRC_M4_STARTED, 0, 0);
return call_imx_sip(FSL_SIP_SRC, FSL_SIP_SRC_M4_STARTED, 0, 0, 0);
}
#endif
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/arch/sys_proto.h>
unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2)
unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2, unsigned long reg3)
{
struct pt_regs regs;
......@@ -15,6 +15,7 @@ unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long r
regs.regs[1] = reg0;
regs.regs[2] = reg1;
regs.regs[3] = reg2;
regs.regs[4] = reg3;
smc_call(&regs);
......
......@@ -87,6 +87,6 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data);
int arch_auxiliary_core_check_up(u32 core_id);
#ifdef CONFIG_ARM64
unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2);
unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2, unsigned long reg3);
#endif
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment