From: Jay Buddhabhatti <jay.buddhabhatti@amd.com>
To: <michal.simek@amd.com>, <gregkh@linuxfoundation.org>,
<tanmay.shah@amd.com>, <mathieu.poirier@linaro.org>,
<nava.kishore.manne@amd.com>, <ben.levinsky@amd.com>,
<sai.krishna.potthuri@amd.com>, <marex@denx.de>,
<robh@kernel.org>, <ruanjinjie@huawei.com>, <arnd@arndb.de>,
<shubhrajyoti.datta@amd.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Jay Buddhabhatti <jay.buddhabhatti@amd.com>
Subject: [PATCH v4 4/5] drivers: soc: xilinx: Fix error message on SGI registration failure
Date: Wed, 8 Nov 2023 23:00:20 -0800 [thread overview]
Message-ID: <20231109070021.16291-5-jay.buddhabhatti@amd.com> (raw)
In-Reply-To: <20231109070021.16291-1-jay.buddhabhatti@amd.com>
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>
---
drivers/firmware/xilinx/zynqmp.c | 4 +++-
drivers/soc/xilinx/xlnx_event_manager.c | 6 +++++-
include/linux/firmware/xlnx-zynqmp.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 125bf6ad28bf..ff57dda669c7 100644
--- 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 adb875f89829..27a8d89a0a09 100644
--- 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 96f3d949afd8..815bef3f0bd9 100644
--- 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,
--
2.17.1
next prev parent reply other threads:[~2023-11-09 7:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 7:00 [PATCH v4 0/5] update for versal net platform Jay Buddhabhatti
2023-11-09 7:00 ` [PATCH v4 1/5] firmware: xilinx: Update firmware call interface to support additional args Jay Buddhabhatti
2023-11-11 6:47 ` kernel test robot
2023-11-14 20:00 ` Nathan Chancellor
2023-11-09 7:00 ` [PATCH v4 2/5] firmware: xilinx: Expand feature check to support all PLM modules Jay Buddhabhatti
2023-11-09 7:00 ` [PATCH v4 3/5] firmware: xilinx: Register event manager driver Jay Buddhabhatti
2023-11-09 7:00 ` Jay Buddhabhatti [this message]
2023-11-09 7:00 ` [PATCH v4 5/5] firmware: zynqmp: Add support to handle IPI CRC failure Jay Buddhabhatti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231109070021.16291-5-jay.buddhabhatti@amd.com \
--to=jay.buddhabhatti@amd.com \
--cc=arnd@arndb.de \
--cc=ben.levinsky@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=mathieu.poirier@linaro.org \
--cc=michal.simek@amd.com \
--cc=nava.kishore.manne@amd.com \
--cc=robh@kernel.org \
--cc=ruanjinjie@huawei.com \
--cc=sai.krishna.potthuri@amd.com \
--cc=shubhrajyoti.datta@amd.com \
--cc=tanmay.shah@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®