From: Russ Weight <russell.h.weight@intel.com>
To: mdf@kernel.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: trix@redhat.com, lgoncalv@redhat.com, yilun.xu@intel.com,
hao.wu@intel.com, matthew.gerlach@intel.com,
Russ Weight <russell.h.weight@intel.com>
Subject: [PATCH v1 1/2] fpga: dfl: afu: Clear port errors in afu init
Date: Tue, 19 Oct 2021 16:15:44 -0700 [thread overview]
Message-ID: <20211019231545.47118-2-russell.h.weight@intel.com> (raw)
In-Reply-To: <20211019231545.47118-1-russell.h.weight@intel.com>
When the AFU driver initializes, log any pre-existing errors and clear them.
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
---
drivers/fpga/dfl-afu-error.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/fpga/dfl-afu-error.c b/drivers/fpga/dfl-afu-error.c
index ab7be6217368..0dc60bf49902 100644
--- a/drivers/fpga/dfl-afu-error.c
+++ b/drivers/fpga/dfl-afu-error.c
@@ -47,13 +47,13 @@ static void afu_port_err_mask(struct device *dev, bool mask)
}
/* clear port errors. */
-static int afu_port_err_clear(struct device *dev, u64 err)
+static int afu_port_err_clear(struct device *dev, u64 err, bool clear_all)
{
struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
struct platform_device *pdev = to_platform_device(dev);
+ u64 v, port_error, port_first_error;
void __iomem *base_err, *base_hdr;
int enable_ret = 0, ret = -EBUSY;
- u64 v;
base_err = dfl_get_feature_ioaddr_by_id(dev, PORT_FEATURE_ID_ERROR);
base_hdr = dfl_get_feature_ioaddr_by_id(dev, PORT_FEATURE_ID_HEADER);
@@ -88,16 +88,21 @@ static int afu_port_err_clear(struct device *dev, u64 err)
__afu_port_err_mask(dev, true);
/* Clear errors if err input matches with current port errors.*/
- v = readq(base_err + PORT_ERROR);
+ port_error = readq(base_err + PORT_ERROR);
- if (v == err) {
- writeq(v, base_err + PORT_ERROR);
+ if (clear_all || port_error == err) {
+ port_first_error = readq(base_err + PORT_FIRST_ERROR);
- v = readq(base_err + PORT_FIRST_ERROR);
- writeq(v, base_err + PORT_FIRST_ERROR);
+ if (clear_all && (port_error || port_first_error))
+ dev_warn(dev,
+ "Port Error: 0x%llx, First Error 0x%llx\n",
+ port_error, port_first_error);
+
+ writeq(port_error, base_err + PORT_ERROR);
+ writeq(port_first_error, base_err + PORT_FIRST_ERROR);
} else {
dev_warn(dev, "%s: received 0x%llx, expected 0x%llx\n",
- __func__, v, err);
+ __func__, port_error, err);
ret = -EINVAL;
}
@@ -137,7 +142,7 @@ static ssize_t errors_store(struct device *dev, struct device_attribute *attr,
if (kstrtou64(buff, 0, &value))
return -EINVAL;
- ret = afu_port_err_clear(dev, value);
+ ret = afu_port_err_clear(dev, value, false);
return ret ? ret : count;
}
@@ -211,7 +216,8 @@ const struct attribute_group port_err_group = {
static int port_err_init(struct platform_device *pdev,
struct dfl_feature *feature)
{
- afu_port_err_mask(&pdev->dev, false);
+ if (afu_port_err_clear(&pdev->dev, 0, true))
+ afu_port_err_mask(&pdev->dev, false);
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2021-10-19 23:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 23:15 [PATCH v1 0/2] fpga: dfl: Log and clear errors on driver init Russ Weight
2021-10-19 23:15 ` Russ Weight [this message]
2021-10-20 4:15 ` [PATCH v1 1/2] fpga: dfl: afu: Clear port errors in afu init Xu Yilun
2021-10-20 12:18 ` Tom Rix
2021-10-20 16:02 ` Russ Weight
2021-10-19 23:15 ` [PATCH v1 2/2] fpga: dfl: fme: Clear fme global errors at driver init Russ Weight
2021-10-20 12:59 ` Tom Rix
2021-10-20 4:44 ` [PATCH v1 0/2] fpga: dfl: Log and clear errors on " Wu, Hao
2021-10-21 0:05 ` Russ Weight
2021-10-21 0:43 ` Wu, Hao
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=20211019231545.47118-2-russell.h.weight@intel.com \
--to=russell.h.weight@intel.com \
--cc=hao.wu@intel.com \
--cc=lgoncalv@redhat.com \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.gerlach@intel.com \
--cc=mdf@kernel.org \
--cc=trix@redhat.com \
--cc=yilun.xu@intel.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