diff options
Diffstat (limited to 'services/std_svc/std_svc_setup.c')
| -rw-r--r-- | services/std_svc/std_svc_setup.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 23f13ab82..1917d0a14 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -13,6 +13,7 @@ #include <lib/pmf/pmf.h> #include <lib/psci/psci.h> #include <lib/runtime_instr.h> +#include <services/pci_svc.h> #include <services/sdei.h> #include <services/spm_mm_svc.h> #include <services/spmd_svc.h> @@ -82,6 +83,15 @@ static uintptr_t std_svc_smc_handler(uint32_t smc_fid, void *handle, u_register_t flags) { + if (((smc_fid >> FUNCID_CC_SHIFT) & FUNCID_CC_MASK) == SMC_32) { + /* 32-bit SMC function, clear top parameter bits */ + + x1 &= UINT32_MAX; + x2 &= UINT32_MAX; + x3 &= UINT32_MAX; + x4 &= UINT32_MAX; + } + /* * Dispatch PSCI calls to PSCI SMC handler and return its return * value @@ -149,6 +159,13 @@ static uintptr_t std_svc_smc_handler(uint32_t smc_fid, } #endif +#if SMC_PCI_SUPPORT + if (is_pci_fid(smc_fid)) { + return pci_smc_handler(smc_fid, x1, x2, x3, x4, cookie, handle, + flags); + } +#endif + switch (smc_fid) { case ARM_STD_SVC_CALL_COUNT: /* @@ -166,7 +183,7 @@ static uintptr_t std_svc_smc_handler(uint32_t smc_fid, SMC_RET2(handle, STD_SVC_VERSION_MAJOR, STD_SVC_VERSION_MINOR); default: - WARN("Unimplemented Standard Service Call: 0x%x \n", smc_fid); + VERBOSE("Unimplemented Standard Service Call: 0x%x \n", smc_fid); SMC_RET1(handle, SMC_UNK); } } |