| Message ID | 20240920055546.2658783-1-ronak.jain@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | firmware: xilinx: fix feature check logic for TF-A specific APIs | expand |
On 9/20/24 07:55, Ronak Jain wrote: > 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> > --- > drivers/firmware/xilinx/zynqmp.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c > index 5ab0dfb2b225..0b2ad46c8bce 100644 > --- 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) Applied. M
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c index 5ab0dfb2b225..0b2ad46c8bce 100644 --- 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)