mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
firmware: xilinx: enable feature check for ZynqMP
Enable the feature check if the PM_FEATURE_CHECK API returns success with the supported version for the ZynqMP. Currently, it is enabled for Versal only. Move get_set_conduit_method() at the beginning as the Linux is requesting to TF-A for the PM_FEATURE_CHECK API version for which the interface should be enabled with TF-A. Signed-off-by: Ronak Jain <ronak.jain@xilinx.com> Link: https://lore.kernel.org/r/1649242526-17493-5-git-send-email-ronak.jain@xilinx.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
218f01a80a
commit
e5052bec7e
1 changed files with 11 additions and 4 deletions
|
@ -1662,6 +1662,10 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
|
||||||
struct zynqmp_devinfo *devinfo;
|
struct zynqmp_devinfo *devinfo;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
ret = get_set_conduit_method(dev->of_node);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
np = of_find_compatible_node(NULL, NULL, "xlnx,zynqmp");
|
np = of_find_compatible_node(NULL, NULL, "xlnx,zynqmp");
|
||||||
if (!np) {
|
if (!np) {
|
||||||
np = of_find_compatible_node(NULL, NULL, "xlnx,versal");
|
np = of_find_compatible_node(NULL, NULL, "xlnx,versal");
|
||||||
|
@ -1670,11 +1674,14 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
feature_check_enabled = true;
|
feature_check_enabled = true;
|
||||||
}
|
}
|
||||||
of_node_put(np);
|
|
||||||
|
|
||||||
ret = get_set_conduit_method(dev->of_node);
|
if (!feature_check_enabled) {
|
||||||
if (ret)
|
ret = do_feature_check_call(PM_FEATURE_CHECK);
|
||||||
return ret;
|
if (ret >= 0)
|
||||||
|
feature_check_enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
of_node_put(np);
|
||||||
|
|
||||||
devinfo = devm_kzalloc(dev, sizeof(*devinfo), GFP_KERNEL);
|
devinfo = devm_kzalloc(dev, sizeof(*devinfo), GFP_KERNEL);
|
||||||
if (!devinfo)
|
if (!devinfo)
|
||||||
|
|
Loading…
Reference in a new issue