From: Jay Buddhabhatti <jay.buddhabhatti@amd.com>
To: <michal.simek@amd.com>, <tanmay.shah@amd.com>,
<gregkh@linuxfoundation.org>, <nava.kishore.manne@amd.com>,
<ben.levinsky@amd.com>, <robh@kernel.org>,
<dhaval.r.shah@amd.com>, <marex@denx.de>,
<izhar.ameer.shaikh@amd.com>, <arnd@arndb.de>,
<ruanjinjie@huawei.com>, <mathieu.poirier@linaro.org>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Jay Buddhabhatti <jay.buddhabhatti@amd.com>
Subject: [PATCH v2 4/6] drivers: soc: xilinx: Fix error message on SGI registration failure
Date: Wed, 4 Oct 2023 02:41:14 -0700 [thread overview]
Message-ID: <20231004094116.27128-5-jay.buddhabhatti@amd.com> (raw)
In-Reply-To: <20231004094116.27128-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 | 7 ++++++-
include/linux/firmware/xlnx-zynqmp.h | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 00ea2508f692..de09d77cf1e4 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:
@@ -379,7 +381,7 @@ int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset)
ret = zynqmp_pm_invoke_fn(TF_A_PM_REGISTER_SGI, sgi_num, reset, 0, 0,
0, NULL);
- 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 38cfc161a713..bfa5cf4a0cab 100644
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -653,7 +653,12 @@ 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_info(&pdev->dev, "PM firmware event notification not supported\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 86fb73269d95..4afd5d63177e 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -160,6 +160,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.25.1
next prev parent reply other threads:[~2023-10-04 9:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 9:41 [PATCH v2 0/6] update for versal net platform Jay Buddhabhatti
2023-10-04 9:41 ` [PATCH v2 1/6] firmware: xilinx: Update firmware call interface to support additional arg Jay Buddhabhatti
2023-10-04 12:14 ` Greg KH
2023-10-04 9:41 ` [PATCH v2 2/6] firmware: xilinx: Expand feature check to support all PLM modules Jay Buddhabhatti
2023-10-04 11:30 ` Michal Simek
2023-10-04 9:41 ` [PATCH v2 3/6] firmware: xilinx: Register event manager driver Jay Buddhabhatti
2023-10-04 9:41 ` Jay Buddhabhatti [this message]
2023-10-04 12:15 ` [PATCH v2 4/6] drivers: soc: xilinx: Fix error message on SGI registration failure Greg KH
2023-10-04 12:48 ` Buddhabhatti, Jay
2023-10-04 12:51 ` Greg KH
2023-10-04 9:41 ` [PATCH v2 5/6] firmware: zynqmp: Add support to handle IPI CRC failure Jay Buddhabhatti
2023-10-04 9:41 ` [PATCH v2 6/6] drivers: soc: xilinx: update maintainer of event manager driver Jay Buddhabhatti
2023-10-04 12:17 ` Greg KH
2023-10-04 13:16 ` Michal Simek
2023-10-04 13:47 ` Greg KH
2023-10-04 14:34 ` Michal Simek
2023-10-05 14:09 ` Buddhabhatti, Jay
2023-10-05 14:10 ` Greg KH
2023-10-06 5:15 ` Buddhabhatti, Jay
2023-10-04 11:31 ` [PATCH v2 0/6] update for versal net platform Michal Simek
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=20231004094116.27128-5-jay.buddhabhatti@amd.com \
--to=jay.buddhabhatti@amd.com \
--cc=arnd@arndb.de \
--cc=ben.levinsky@amd.com \
--cc=dhaval.r.shah@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=izhar.ameer.shaikh@amd.com \
--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=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®