From 6a80c20eff74054c28273b42f3fe8e1a8fc5add4 Mon Sep 17 00:00:00 2001 From: Akshay Belsare Date: Thu, 11 Jan 2024 14:47:02 +0530 Subject: [PATCH] fix(xilinx): deprecate SiP service count query As per SMCCC Section 6.2, the call count query for all the services has been deprecated from SMCCC v1.2 onwards. Inline with above change, AMD-Xilinx SiP service count query has been deprecated and now onwards will return unknown function identifier error. Change-Id: I296d119d65549fdb01718d08351d255550e4ead0 Signed-off-by: Akshay Belsare --- plat/xilinx/versal/sip_svc_setup.c | 5 ----- plat/xilinx/versal_net/sip_svc_setup.c | 5 ----- plat/xilinx/zynqmp/sip_svc_setup.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/plat/xilinx/versal/sip_svc_setup.c b/plat/xilinx/versal/sip_svc_setup.c index b30254d58..4441d3eaa 100644 --- a/plat/xilinx/versal/sip_svc_setup.c +++ b/plat/xilinx/versal/sip_svc_setup.c @@ -17,7 +17,6 @@ #include "pm_svc_main.h" /* SMC function IDs for SiP Service queries */ -#define VERSAL_SIP_SVC_CALL_COUNT U(0x8200ff00) #define VERSAL_SIP_SVC_UID U(0x8200ff01) #define VERSAL_SIP_SVC_VERSION U(0x8200ff03) @@ -100,10 +99,6 @@ uintptr_t sip_svc_smc_handler(uint32_t smc_fid, /* Let PM SMC handler deal with PM-related requests */ switch (smc_fid) { - case VERSAL_SIP_SVC_CALL_COUNT: - /* PM functions + default functions */ - SMC_RET1(handle, 2); - case VERSAL_SIP_SVC_UID: SMC_UUID_RET(handle, versal_sip_uuid); diff --git a/plat/xilinx/versal_net/sip_svc_setup.c b/plat/xilinx/versal_net/sip_svc_setup.c index 0c27dec59..80d5a5323 100644 --- a/plat/xilinx/versal_net/sip_svc_setup.c +++ b/plat/xilinx/versal_net/sip_svc_setup.c @@ -20,7 +20,6 @@ #include "pm_svc_main.h" /* SMC function IDs for SiP Service queries */ -#define VERSAL_NET_SIP_SVC_CALL_COUNT (0x8200ff00U) #define VERSAL_NET_SIP_SVC_UID (0x8200ff01U) #define VERSAL_NET_SIP_SVC_VERSION (0x8200ff03U) @@ -88,10 +87,6 @@ static uintptr_t sip_svc_smc_handler(uint32_t smc_fid, /* Let PM SMC handler deal with PM-related requests */ switch (smc_fid) { - case VERSAL_NET_SIP_SVC_CALL_COUNT: - /* PM functions + default functions */ - SMC_RET1(handle, 2); - case VERSAL_NET_SIP_SVC_UID: SMC_UUID_RET(handle, versal_net_sip_uuid); diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index 6a8555ee4..f5990ca59 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -18,7 +18,6 @@ #include "zynqmp_pm_svc_main.h" /* SMC function IDs for SiP Service queries */ -#define ZYNQMP_SIP_SVC_CALL_COUNT U(0x8200ff00) #define ZYNQMP_SIP_SVC_UID U(0x8200ff01) #define ZYNQMP_SIP_SVC_VERSION U(0x8200ff03) @@ -100,10 +99,6 @@ static uintptr_t sip_svc_smc_handler(uint32_t smc_fid, } switch (smc_fid) { - case ZYNQMP_SIP_SVC_CALL_COUNT: - /* PM functions + default functions */ - SMC_RET1(handle, PM_API_MAX + 2); - case ZYNQMP_SIP_SVC_UID: SMC_UUID_RET(handle, zynqmp_sip_uuid);