Commit 8c016c80 authored by Jay Buddhabhatti's avatar Jay Buddhabhatti Committed by Greg Kroah-Hartman

drivers: soc: xilinx: Fix error message on SGI registration failure

Failure to register SGI for firmware event notification is non-fatal error
when feature is not supported by other modules such as Xen and TF-A. Add
_info level log message for such special case.

Also add XST_PM_INVALID_VERSION error code and map it to -EOPNOSUPP Linux
kernel error code. If feature is not supported or EEMI API version is
mismatch, firmware can return XST_PM_INVALID_VERSION = 4 or
XST_PM_NO_FEATURE = 19 error code.
Co-developed-by: default avatarTanmay Shah <tanmay.shah@amd.com>
Signed-off-by: default avatarTanmay Shah <tanmay.shah@amd.com>
Signed-off-by: default avatarJay Buddhabhatti <jay.buddhabhatti@amd.com>
Link: https://lore.kernel.org/r/20231129112713.22718-5-jay.buddhabhatti@amd.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9d06184
...@@ -92,6 +92,8 @@ static int zynqmp_pm_ret_code(u32 ret_status) ...@@ -92,6 +92,8 @@ static int zynqmp_pm_ret_code(u32 ret_status)
return 0; return 0;
case XST_PM_NO_FEATURE: case XST_PM_NO_FEATURE:
return -ENOTSUPP; return -ENOTSUPP;
case XST_PM_INVALID_VERSION:
return -EOPNOTSUPP;
case XST_PM_NO_ACCESS: case XST_PM_NO_ACCESS:
return -EACCES; return -EACCES;
case XST_PM_ABORT_SUSPEND: case XST_PM_ABORT_SUSPEND:
...@@ -396,7 +398,7 @@ int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset) ...@@ -396,7 +398,7 @@ int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset)
int ret; int ret;
ret = zynqmp_pm_invoke_fn(TF_A_PM_REGISTER_SGI, NULL, 2, sgi_num, reset); ret = zynqmp_pm_invoke_fn(TF_A_PM_REGISTER_SGI, NULL, 2, sgi_num, reset);
if (!ret) if (ret != -EOPNOTSUPP && !ret)
return ret; return ret;
/* try old implementation as fallback strategy if above fails */ /* try old implementation as fallback strategy if above fails */
......
...@@ -653,7 +653,11 @@ static int xlnx_event_manager_probe(struct platform_device *pdev) ...@@ -653,7 +653,11 @@ static int xlnx_event_manager_probe(struct platform_device *pdev)
ret = zynqmp_pm_register_sgi(sgi_num, 0); ret = zynqmp_pm_register_sgi(sgi_num, 0);
if (ret) { if (ret) {
dev_err(&pdev->dev, "SGI %d Registration over TF-A failed with %d\n", sgi_num, ret); if (ret == -EOPNOTSUPP)
dev_err(&pdev->dev, "SGI registration not supported by TF-A or Xen\n");
else
dev_err(&pdev->dev, "SGI %d registration failed, err %d\n", sgi_num, ret);
xlnx_event_cleanup_sgi(pdev); xlnx_event_cleanup_sgi(pdev);
return ret; return ret;
} }
......
...@@ -172,6 +172,7 @@ enum pm_api_id { ...@@ -172,6 +172,7 @@ enum pm_api_id {
/* PMU-FW return status codes */ /* PMU-FW return status codes */
enum pm_ret_status { enum pm_ret_status {
XST_PM_SUCCESS = 0, XST_PM_SUCCESS = 0,
XST_PM_INVALID_VERSION = 4,
XST_PM_NO_FEATURE = 19, XST_PM_NO_FEATURE = 19,
XST_PM_INTERNAL = 2000, XST_PM_INTERNAL = 2000,
XST_PM_CONFLICT = 2001, XST_PM_CONFLICT = 2001,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment