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: Tanmay Shah <tanmay.shah@amd.com>
Signed-off-by: Tanmay Shah <tanmay.shah@amd.com>
Signed-off-by: Jay Buddhabhatti <jay.buddhabhatti@amd.com>
Link: https://lore.kernel.org/r/20231129112713.22718-5-jay.buddhabhatti@amd.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 533679a07b5754f43f09faacf61b80d1df82881e..077b49e440b57d652b56485eead8b89f3cd9c649 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -92,6 +92,8 @@ static int zynqmp_pm_ret_code(u32 ret_status)
                return 0;
        case XST_PM_NO_FEATURE:
                return -ENOTSUPP;
+       case XST_PM_INVALID_VERSION:
+               return -EOPNOTSUPP;
        case XST_PM_NO_ACCESS:
                return -EACCES;
        case XST_PM_ABORT_SUSPEND:
@@ -396,7 +398,7 @@ int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset)
        int ret;
 
        ret = zynqmp_pm_invoke_fn(TF_A_PM_REGISTER_SGI, NULL, 2, sgi_num, reset);
-       if (!ret)
+       if (ret != -EOPNOTSUPP && !ret)
                return ret;
 
        /* try old implementation as fallback strategy if above fails */

diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
index adb875f8982996eb70fbdc002aa0a0151a4c4a56..27a8d89a0a091ff36c4edf8f4e35cc745308e406 100644 (file)
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -653,7 +653,11 @@ static int xlnx_event_manager_probe(struct platform_device *pdev)
 
        ret = zynqmp_pm_register_sgi(sgi_num, 0);
        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);
                return ret;
        }

diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index e9a7fece5efef5ce2de54e94903f73c19b0ae8ea..ec1800c8600699413ecb8f1fc80eaeb55b33fd13 100644 (file)
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -172,6 +172,7 @@ enum pm_api_id {
 /* PMU-FW return status codes */
 enum pm_ret_status {
        XST_PM_SUCCESS = 0,
+       XST_PM_INVALID_VERSION = 4,
        XST_PM_NO_FEATURE = 19,
        XST_PM_INTERNAL = 2000,
        XST_PM_CONFLICT = 2001,