From 0ee07d796cece8074eb296415c88872504dee682 Mon Sep 17 00:00:00 2001 From: Akshay Belsare Date: Mon, 12 Dec 2022 12:13:14 +0530 Subject: [PATCH] fix(xilinx): use lib/smccc.h macros instead of trusty spd There is no reason to use macros from trusty spd header and creating dependency on it. Use directly macros from lib/smccc.h Co-developed-by: Michal Simek Signed-off-by: Michal Simek Signed-off-by: Akshay Belsare Change-Id: I7cf1f76a5358ffc297c914f41c437469f5a42411 --- plat/xilinx/common/ipi_mailbox_service/ipi_mailbox_svc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plat/xilinx/common/ipi_mailbox_service/ipi_mailbox_svc.c b/plat/xilinx/common/ipi_mailbox_service/ipi_mailbox_svc.c index cb6aaa5df..30b0176a0 100644 --- a/plat/xilinx/common/ipi_mailbox_service/ipi_mailbox_svc.c +++ b/plat/xilinx/common/ipi_mailbox_service/ipi_mailbox_svc.c @@ -21,7 +21,6 @@ #include #include "ipi_mailbox_svc.h" -#include "../../../services/spd/trusty/smcall.h" /********************************************************************* * Macros definitions @@ -75,17 +74,19 @@ uint64_t ipi_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, ipi_local_id = x1 & UNSIGNED32_MASK; ipi_remote_id = x2 & UNSIGNED32_MASK; - if (SMC_ENTITY(smc_fid) >= SMC_ENTITY_TRUSTED_APP) + if ((GET_SMC_OEN(smc_fid) >= OEN_TAP_START) && + (GET_SMC_OEN(smc_fid) <= OEN_TOS_END)) { is_secure = 1; - else + } else { is_secure = 0; + } /* Validate IPI mailbox access */ ret = ipi_mb_validate(ipi_local_id, ipi_remote_id, is_secure); if (ret) SMC_RET1(handle, ret); - switch (SMC_FUNCTION(smc_fid)) { + switch (GET_SMC_NUM(smc_fid)) { case IPI_MAILBOX_OPEN: ipi_mb_open(ipi_local_id, ipi_remote_id); SMC_RET1(handle, 0); -- 2.39.5