From bcc1348b6bb2fcd987c8f047fa9f526f32768258 Mon Sep 17 00:00:00 2001 From: Nava kishore Manne Date: Wed, 15 Feb 2023 16:13:48 +0530 Subject: [PATCH] fix(zynqmp): update the conflicting EEMI API IDs In the ZynqMP, 0x36 EEMI API ID is used for PM_FPGA_GET_VERSION and 0x37 is used for PM_FPGA_GET_FEATURE_LIST. The same ID numbers in the Versal are used for PM_ADD_SUBSYSTEM and PM_DESTROY_SUBSYSTEM and it leads to the EEMI API ID conflict between the platforms. To fix this issue this patch updates the PM_FPGA_GET_VERSION and PM_FPGA_GET_FEATURE_LIST EEMI API ID's to 0x48 and 0x49. In linux zynqmp_pm_fpga_get_version() and zynqmp_pm_fpga_get_feature_list() API's are uses PM_FPGA_GET_VERSION and PM_FPGA_GET_FEATURE_LIST to get the xilfpga version and xilfpga-supported feature list info. These API's are called only in zynqmp-fpga.c as part of the probe. In case of this caller API's are failed it will fall to the default feature list and this default feature list is same as latest xilfpga-supported feature list (No new feature was added in the xilfpga after adding these APIs). So, these updated IDs will not cause any functional issues between Linux, TF-A, and firmware components. Signed-off-by: Nava kishore Manne Change-Id: I14d974dd44651681ecbf726ad8b6940e1850cbec --- plat/xilinx/zynqmp/pm_service/pm_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plat/xilinx/zynqmp/pm_service/pm_defs.h b/plat/xilinx/zynqmp/pm_service/pm_defs.h index e335b9443..628123545 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_defs.h +++ b/plat/xilinx/zynqmp/pm_service/pm_defs.h @@ -122,9 +122,9 @@ enum pm_api_id { /* PM Register Access API */ PM_REGISTER_ACCESS, PM_EFUSE_ACCESS, - PM_FPGA_GET_VERSION, - PM_FPGA_GET_FEATURE_LIST, PM_FEATURE_CHECK = 63, + PM_FPGA_GET_VERSION = 72, + PM_FPGA_GET_FEATURE_LIST, PM_API_MAX }; -- 2.39.5