firmware: xilinx: fix feature check logic for TF-A specific APIs

Currently, Linux is passing only API ID for feature of TF-A specific
APIs but for feature check of TF-A specific APIs, TF-A is checking
for Module ID + API ID as a result incorrect version is received for
all TF-A specific APIs. So, fix feature check logic to pass valid
arguments to get correct version.

Signed-off-by: Ronak Jain <ronak.jain@amd.com>
Signed-off-by: Jay Buddhabhatti <jay.buddhabhatti@amd.com>
Link: https://lore.kernel.org/r/20240920055546.2658783-1-ronak.jain@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 5022bd71705415a01c44d4a4edc24219c56239ed..cdb565c411198910114b0bc6a67496e9e851cd83 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -225,11 +225,14 @@ static int __do_feature_check_call(const u32 api_id, u32 *ret_payload)
         * Feature check of TF-A APIs is done in the TF-A layer and it expects for
         * MODULE_ID_MASK bits of SMC's arg[0] to be the same as PM_MODULE_ID.
         */
-       if (module_id == TF_A_MODULE_ID)
+       if (module_id == TF_A_MODULE_ID) {
                module_id = PM_MODULE_ID;
+               smc_arg[1] = api_id;
+       } else {
+               smc_arg[1] = (api_id & API_ID_MASK);
+       }
 
        smc_arg[0] = PM_SIP_SVC | FIELD_PREP(MODULE_ID_MASK, module_id) | feature_check_api_id;
-       smc_arg[1] = (api_id & API_ID_MASK);
 
        ret = do_fw_call(ret_payload, 2, smc_arg[0], smc_arg[1]);
        if (ret)