Oliver Neukum a46fd7
From cb3c2c47e3b8068e5d46ad829318cd077406fc9d Mon Sep 17 00:00:00 2001
Oliver Neukum a46fd7
From: Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
Date: Mon, 12 Aug 2019 10:50:03 +0800
Oliver Neukum a46fd7
Subject: [PATCH] fpga: dfl: fme: add global error reporting support
Oliver Neukum a46fd7
Git-commit: cb3c2c47e3b8068e5d46ad829318cd077406fc9d
Oliver Neukum a46fd7
References: jsc#SLE-13441
Oliver Neukum a46fd7
Patch-mainline: v5.4-rc1
Oliver Neukum a46fd7
Oliver Neukum a46fd7
This patch adds support for global error reporting for FPGA
Oliver Neukum a46fd7
Management Engine (FME), it introduces sysfs interfaces to
Oliver Neukum a46fd7
report different error detected by the hardware, and allow
Oliver Neukum a46fd7
user to clear errors or inject error for testing purpose.
Oliver Neukum a46fd7
Oliver Neukum a46fd7
Signed-off-by: Luwei Kang <luwei.kang@intel.com>
Oliver Neukum a46fd7
Signed-off-by: Ananda Ravuri <ananda.ravuri@intel.com>
Oliver Neukum a46fd7
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Oliver Neukum a46fd7
Signed-off-by: Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
Acked-by: Alan Tull <atull@kernel.org>
Oliver Neukum a46fd7
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Oliver Neukum a46fd7
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Oliver Neukum a46fd7
---
Oliver Neukum 51e148
 Documentation/ABI/testing/sysfs-platform-dfl-fme |   62 +++
Oliver Neukum 51e148
 drivers/fpga/Makefile                            |    2 
Oliver Neukum 51e148
 drivers/fpga/dfl-fme-error.c                     |  359 +++++++++++++++++++++++
Oliver Neukum 51e148
 drivers/fpga/dfl-fme-main.c                      |   17 -
Oliver Neukum 51e148
 drivers/fpga/dfl-fme.h                           |    3 
Oliver Neukum 51e148
 drivers/fpga/dfl.h                               |    5 
Oliver Neukum 51e148
 6 files changed, 445 insertions(+), 3 deletions(-)
Oliver Neukum a46fd7
 create mode 100644 drivers/fpga/dfl-fme-error.c
Oliver Neukum a46fd7
Oliver Neukum a46fd7
--- a/Documentation/ABI/testing/sysfs-platform-dfl-fme
Oliver Neukum a46fd7
+++ b/Documentation/ABI/testing/sysfs-platform-dfl-fme
Oliver Neukum 51e148
@@ -44,3 +44,65 @@ Description:	Read-only. It returns socke
Oliver Neukum a46fd7
 		this FPGA belongs to, only valid for integrated solution.
Oliver Neukum a46fd7
 		User only needs this information, in case standard numa node
Oliver Neukum a46fd7
 		can't provide correct information.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/pcie0_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-Write. Read this file for errors detected on pcie0 link.
Oliver Neukum a46fd7
+		Write this file to clear errors logged in pcie0_errors. Write
Oliver Neukum a46fd7
+		fails with -EINVAL if input parsing fails or input error code
Oliver Neukum a46fd7
+		doesn't match.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/pcie1_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-Write. Read this file for errors detected on pcie1 link.
Oliver Neukum a46fd7
+		Write this file to clear errors logged in pcie1_errors. Write
Oliver Neukum a46fd7
+		fails with -EINVAL if input parsing fails or input error code
Oliver Neukum a46fd7
+		doesn't match.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/nonfatal_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-only. It returns non-fatal errors detected.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/catfatal_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-only. It returns catastrophic and fatal errors detected.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/inject_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-Write. Read this file to check errors injected. Write this
Oliver Neukum a46fd7
+		file to inject errors for testing purpose. Write fails with
Oliver Neukum a46fd7
+		-EINVAL if input parsing fails or input inject error code isn't
Oliver Neukum a46fd7
+		supported.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/fme_errors
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-Write. Read this file to get errors detected on FME.
Oliver Neukum a46fd7
+		Write this file to clear errors logged in fme_errors. Write
Oliver Neukum a46fd7
+		fials with -EINVAL if input parsing fails or input error code
Oliver Neukum a46fd7
+		doesn't match.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/first_error
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-only. Read this file to get the first error detected by
Oliver Neukum a46fd7
+		hardware.
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+What:		/sys/bus/platform/devices/dfl-fme.0/errors/next_error
Oliver Neukum a46fd7
+Date:		August 2019
Oliver Neukum a46fd7
+KernelVersion:  5.4
Oliver Neukum a46fd7
+Contact:	Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+Description:	Read-only. Read this file to get the second error detected by
Oliver Neukum a46fd7
+		hardware.
Oliver Neukum a46fd7
--- a/drivers/fpga/Makefile
Oliver Neukum a46fd7
+++ b/drivers/fpga/Makefile
Oliver Neukum 51e148
@@ -39,7 +39,7 @@ obj-$(CONFIG_FPGA_DFL_FME_BRIDGE)	+= dfl
Oliver Neukum a46fd7
 obj-$(CONFIG_FPGA_DFL_FME_REGION)	+= dfl-fme-region.o
Oliver Neukum a46fd7
 obj-$(CONFIG_FPGA_DFL_AFU)		+= dfl-afu.o
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
-dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o
Oliver Neukum a46fd7
+dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o
Oliver Neukum a46fd7
 dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o
Oliver Neukum a46fd7
 dfl-afu-objs += dfl-afu-error.o
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
--- /dev/null
Oliver Neukum a46fd7
+++ b/drivers/fpga/dfl-fme-error.c
Oliver Neukum a46fd7
@@ -0,0 +1,359 @@
Oliver Neukum a46fd7
+// SPDX-License-Identifier: GPL-2.0
Oliver Neukum a46fd7
+/*
Oliver Neukum a46fd7
+ * Driver for FPGA Management Engine Error Management
Oliver Neukum a46fd7
+ *
Oliver Neukum a46fd7
+ * Copyright 2019 Intel Corporation, Inc.
Oliver Neukum a46fd7
+ *
Oliver Neukum a46fd7
+ * Authors:
Oliver Neukum a46fd7
+ *   Kang Luwei <luwei.kang@intel.com>
Oliver Neukum a46fd7
+ *   Xiao Guangrong <guangrong.xiao@linux.intel.com>
Oliver Neukum a46fd7
+ *   Wu Hao <hao.wu@intel.com>
Oliver Neukum a46fd7
+ *   Joseph Grecco <joe.grecco@intel.com>
Oliver Neukum a46fd7
+ *   Enno Luebbers <enno.luebbers@intel.com>
Oliver Neukum a46fd7
+ *   Tim Whisonant <tim.whisonant@intel.com>
Oliver Neukum a46fd7
+ *   Ananda Ravuri <ananda.ravuri@intel.com>
Oliver Neukum a46fd7
+ *   Mitchel, Henry <henry.mitchel@intel.com>
Oliver Neukum a46fd7
+ */
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+#include <linux/uaccess.h>
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+#include "dfl.h"
Oliver Neukum a46fd7
+#include "dfl-fme.h"
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+#define FME_ERROR_MASK		0x8
Oliver Neukum a46fd7
+#define FME_ERROR		0x10
Oliver Neukum a46fd7
+#define MBP_ERROR		BIT_ULL(6)
Oliver Neukum a46fd7
+#define PCIE0_ERROR_MASK	0x18
Oliver Neukum a46fd7
+#define PCIE0_ERROR		0x20
Oliver Neukum a46fd7
+#define PCIE1_ERROR_MASK	0x28
Oliver Neukum a46fd7
+#define PCIE1_ERROR		0x30
Oliver Neukum a46fd7
+#define FME_FIRST_ERROR		0x38
Oliver Neukum a46fd7
+#define FME_NEXT_ERROR		0x40
Oliver Neukum a46fd7
+#define RAS_NONFAT_ERROR_MASK	0x48
Oliver Neukum a46fd7
+#define RAS_NONFAT_ERROR	0x50
Oliver Neukum a46fd7
+#define RAS_CATFAT_ERROR_MASK	0x58
Oliver Neukum a46fd7
+#define RAS_CATFAT_ERROR	0x60
Oliver Neukum a46fd7
+#define RAS_ERROR_INJECT	0x68
Oliver Neukum a46fd7
+#define INJECT_ERROR_MASK	GENMASK_ULL(2, 0)
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+#define ERROR_MASK		GENMASK_ULL(63, 0)
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t pcie0_errors_show(struct device *dev,
Oliver Neukum a46fd7
+				 struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 value;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	value = readq(base + PCIE0_ERROR);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n", (unsigned long long)value);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t pcie0_errors_store(struct device *dev,
Oliver Neukum a46fd7
+				  struct device_attribute *attr,
Oliver Neukum a46fd7
+				  const char *buf, size_t count)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	int ret = 0;
Oliver Neukum a46fd7
+	u64 v, val;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	if (kstrtou64(buf, 0, &val))
Oliver Neukum a46fd7
+		return -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	writeq(GENMASK_ULL(63, 0), base + PCIE0_ERROR_MASK);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	v = readq(base + PCIE0_ERROR);
Oliver Neukum a46fd7
+	if (val == v)
Oliver Neukum a46fd7
+		writeq(v, base + PCIE0_ERROR);
Oliver Neukum a46fd7
+	else
Oliver Neukum a46fd7
+		ret = -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	writeq(0ULL, base + PCIE0_ERROR_MASK);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+	return ret ? ret : count;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RW(pcie0_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t pcie1_errors_show(struct device *dev,
Oliver Neukum a46fd7
+				 struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 value;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	value = readq(base + PCIE1_ERROR);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n", (unsigned long long)value);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t pcie1_errors_store(struct device *dev,
Oliver Neukum a46fd7
+				  struct device_attribute *attr,
Oliver Neukum a46fd7
+				  const char *buf, size_t count)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	int ret = 0;
Oliver Neukum a46fd7
+	u64 v, val;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	if (kstrtou64(buf, 0, &val))
Oliver Neukum a46fd7
+		return -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	writeq(GENMASK_ULL(63, 0), base + PCIE1_ERROR_MASK);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	v = readq(base + PCIE1_ERROR);
Oliver Neukum a46fd7
+	if (val == v)
Oliver Neukum a46fd7
+		writeq(v, base + PCIE1_ERROR);
Oliver Neukum a46fd7
+	else
Oliver Neukum a46fd7
+		ret = -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	writeq(0ULL, base + PCIE1_ERROR_MASK);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+	return ret ? ret : count;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RW(pcie1_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t nonfatal_errors_show(struct device *dev,
Oliver Neukum a46fd7
+				    struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n",
Oliver Neukum a46fd7
+		       (unsigned long long)readq(base + RAS_NONFAT_ERROR));
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RO(nonfatal_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t catfatal_errors_show(struct device *dev,
Oliver Neukum a46fd7
+				    struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n",
Oliver Neukum a46fd7
+		       (unsigned long long)readq(base + RAS_CATFAT_ERROR));
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RO(catfatal_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t inject_errors_show(struct device *dev,
Oliver Neukum a46fd7
+				  struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 v;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	v = readq(base + RAS_ERROR_INJECT);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n",
Oliver Neukum a46fd7
+		       (unsigned long long)FIELD_GET(INJECT_ERROR_MASK, v));
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t inject_errors_store(struct device *dev,
Oliver Neukum a46fd7
+				   struct device_attribute *attr,
Oliver Neukum a46fd7
+				   const char *buf, size_t count)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u8 inject_error;
Oliver Neukum a46fd7
+	u64 v;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	if (kstrtou8(buf, 0, &inject_error))
Oliver Neukum a46fd7
+		return -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	if (inject_error & ~INJECT_ERROR_MASK)
Oliver Neukum a46fd7
+		return -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	v = readq(base + RAS_ERROR_INJECT);
Oliver Neukum a46fd7
+	v &= ~INJECT_ERROR_MASK;
Oliver Neukum a46fd7
+	v |= FIELD_PREP(INJECT_ERROR_MASK, inject_error);
Oliver Neukum a46fd7
+	writeq(v, base + RAS_ERROR_INJECT);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return count;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RW(inject_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t fme_errors_show(struct device *dev,
Oliver Neukum a46fd7
+			       struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 value;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	value = readq(base + FME_ERROR);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n", (unsigned long long)value);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t fme_errors_store(struct device *dev,
Oliver Neukum a46fd7
+				struct device_attribute *attr,
Oliver Neukum a46fd7
+				const char *buf, size_t count)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 v, val;
Oliver Neukum a46fd7
+	int ret = 0;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	if (kstrtou64(buf, 0, &val))
Oliver Neukum a46fd7
+		return -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	writeq(GENMASK_ULL(63, 0), base + FME_ERROR_MASK);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	v = readq(base + FME_ERROR);
Oliver Neukum a46fd7
+	if (val == v)
Oliver Neukum a46fd7
+		writeq(v, base + FME_ERROR);
Oliver Neukum a46fd7
+	else
Oliver Neukum a46fd7
+		ret = -EINVAL;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	/* Workaround: disable MBP_ERROR if feature revision is 0 */
Oliver Neukum a46fd7
+	writeq(dfl_feature_revision(base) ? 0ULL : MBP_ERROR,
Oliver Neukum a46fd7
+	       base + FME_ERROR_MASK);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+	return ret ? ret : count;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RW(fme_errors);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t first_error_show(struct device *dev,
Oliver Neukum a46fd7
+				struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 value;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	value = readq(base + FME_FIRST_ERROR);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n", (unsigned long long)value);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RO(first_error);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static ssize_t next_error_show(struct device *dev,
Oliver Neukum a46fd7
+			       struct device_attribute *attr, char *buf)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+	u64 value;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+	value = readq(base + FME_NEXT_ERROR);
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return sprintf(buf, "0x%llx\n", (unsigned long long)value);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+static DEVICE_ATTR_RO(next_error);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static struct attribute *fme_global_err_attrs[] = {
Oliver Neukum a46fd7
+	&dev_attr_pcie0_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_pcie1_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_nonfatal_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_catfatal_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_inject_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_fme_errors.attr,
Oliver Neukum a46fd7
+	&dev_attr_first_error.attr,
Oliver Neukum a46fd7
+	&dev_attr_next_error.attr,
Oliver Neukum a46fd7
+	NULL,
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static umode_t fme_global_err_attrs_visible(struct kobject *kobj,
Oliver Neukum a46fd7
+					    struct attribute *attr, int n)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct device *dev = kobj_to_dev(kobj);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	/*
Oliver Neukum a46fd7
+	 * sysfs entries are visible only if related private feature is
Oliver Neukum a46fd7
+	 * enumerated.
Oliver Neukum a46fd7
+	 */
Oliver Neukum a46fd7
+	if (!dfl_get_feature_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR))
Oliver Neukum a46fd7
+		return 0;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return attr->mode;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+const struct attribute_group fme_global_err_group = {
Oliver Neukum a46fd7
+	.name       = "errors",
Oliver Neukum a46fd7
+	.attrs      = fme_global_err_attrs,
Oliver Neukum a46fd7
+	.is_visible = fme_global_err_attrs_visible,
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static void fme_err_mask(struct device *dev, bool mask)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	struct dfl_feature_platform_data *pdata = dev_get_platdata(dev);
Oliver Neukum a46fd7
+	void __iomem *base;
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	base = dfl_get_feature_ioaddr_by_id(dev, FME_FEATURE_ID_GLOBAL_ERR);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_lock(&pdata->lock);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	/* Workaround: keep MBP_ERROR always masked if revision is 0 */
Oliver Neukum a46fd7
+	if (dfl_feature_revision(base))
Oliver Neukum a46fd7
+		writeq(mask ? ERROR_MASK : 0, base + FME_ERROR_MASK);
Oliver Neukum a46fd7
+	else
Oliver Neukum a46fd7
+		writeq(mask ? ERROR_MASK : MBP_ERROR, base + FME_ERROR_MASK);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	writeq(mask ? ERROR_MASK : 0, base + PCIE0_ERROR_MASK);
Oliver Neukum a46fd7
+	writeq(mask ? ERROR_MASK : 0, base + PCIE1_ERROR_MASK);
Oliver Neukum a46fd7
+	writeq(mask ? ERROR_MASK : 0, base + RAS_NONFAT_ERROR_MASK);
Oliver Neukum a46fd7
+	writeq(mask ? ERROR_MASK : 0, base + RAS_CATFAT_ERROR_MASK);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	mutex_unlock(&pdata->lock);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static int fme_global_err_init(struct platform_device *pdev,
Oliver Neukum a46fd7
+			       struct dfl_feature *feature)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	fme_err_mask(&pdev->dev, false);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+	return 0;
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static void fme_global_err_uinit(struct platform_device *pdev,
Oliver Neukum a46fd7
+				 struct dfl_feature *feature)
Oliver Neukum a46fd7
+{
Oliver Neukum a46fd7
+	fme_err_mask(&pdev->dev, true);
Oliver Neukum a46fd7
+}
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+const struct dfl_feature_id fme_global_err_id_table[] = {
Oliver Neukum a46fd7
+	{.id = FME_FEATURE_ID_GLOBAL_ERR,},
Oliver Neukum a46fd7
+	{0,}
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+const struct dfl_feature_ops fme_global_err_ops = {
Oliver Neukum a46fd7
+	.init = fme_global_err_init,
Oliver Neukum a46fd7
+	.uinit = fme_global_err_uinit,
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
--- a/drivers/fpga/dfl-fme-main.c
Oliver Neukum a46fd7
+++ b/drivers/fpga/dfl-fme-main.c
Oliver Neukum 51e148
@@ -127,7 +127,10 @@ static struct attribute *fme_hdr_attrs[]
Oliver Neukum a46fd7
 	&dev_attr_socket_id.attr,
Oliver Neukum a46fd7
 	NULL,
Oliver Neukum a46fd7
 };
Oliver Neukum a46fd7
-ATTRIBUTE_GROUPS(fme_hdr);
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
+static const struct attribute_group fme_hdr_group = {
Oliver Neukum a46fd7
+	.attrs = fme_hdr_attrs,
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
 static long fme_hdr_ioctl_release_port(struct dfl_feature_platform_data *pdata,
Oliver Neukum a46fd7
 				       unsigned long arg)
Oliver Neukum 51e148
@@ -188,6 +191,10 @@ static struct dfl_feature_driver fme_fea
Oliver Neukum a46fd7
 		.ops = &fme_pr_mgmt_ops,
Oliver Neukum a46fd7
 	},
Oliver Neukum 51e148
 	{
Oliver Neukum a46fd7
+		.id_table = fme_global_err_id_table,
Oliver Neukum a46fd7
+		.ops = &fme_global_err_ops,
Oliver Neukum a46fd7
+	},
Oliver Neukum 51e148
+	{
Oliver Neukum a46fd7
 		.ops = NULL,
Oliver Neukum a46fd7
 	},
Oliver Neukum 51e148
 };
Oliver Neukum 51e148
@@ -333,10 +340,16 @@ static int fme_remove(struct platform_de
Oliver Neukum a46fd7
 	return 0;
Oliver Neukum a46fd7
 }
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
+static const struct attribute_group *fme_dev_groups[] = {
Oliver Neukum a46fd7
+	&fme_hdr_group,
Oliver Neukum a46fd7
+	&fme_global_err_group,
Oliver Neukum a46fd7
+	NULL
Oliver Neukum a46fd7
+};
Oliver Neukum a46fd7
+
Oliver Neukum a46fd7
 static struct platform_driver fme_driver = {
Oliver Neukum a46fd7
 	.driver	= {
Oliver Neukum a46fd7
 		.name       = DFL_FPGA_FEATURE_DEV_FME,
Oliver Neukum a46fd7
-		.dev_groups = fme_hdr_groups,
Oliver Neukum a46fd7
+		.dev_groups = fme_dev_groups,
Oliver Neukum a46fd7
 	},
Oliver Neukum a46fd7
 	.probe   = fme_probe,
Oliver Neukum a46fd7
 	.remove  = fme_remove,
Oliver Neukum a46fd7
--- a/drivers/fpga/dfl-fme.h
Oliver Neukum a46fd7
+++ b/drivers/fpga/dfl-fme.h
Oliver Neukum a46fd7
@@ -35,5 +35,8 @@ struct dfl_fme {
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
 extern const struct dfl_feature_ops fme_pr_mgmt_ops;
Oliver Neukum a46fd7
 extern const struct dfl_feature_id fme_pr_mgmt_id_table[];
Oliver Neukum a46fd7
+extern const struct dfl_feature_ops fme_global_err_ops;
Oliver Neukum a46fd7
+extern const struct dfl_feature_id fme_global_err_id_table[];
Oliver Neukum a46fd7
+extern const struct attribute_group fme_global_err_group;
Oliver Neukum a46fd7
 
Oliver Neukum a46fd7
 #endif /* __DFL_FME_H */
Oliver Neukum 51e148
--- a/drivers/fpga/dfl.h
Oliver Neukum 51e148
+++ b/drivers/fpga/dfl.h
Oliver Neukum 51e148
@@ -355,6 +355,11 @@ static inline bool dfl_feature_is_port(v
Oliver Neukum 51e148
 		(FIELD_GET(DFH_ID, v) == DFH_ID_FIU_PORT);
Oliver Neukum 51e148
 }
Oliver Neukum 51e148
 
Oliver Neukum 51e148
+static inline u8 dfl_feature_revision(void __iomem *base)
Oliver Neukum 51e148
+{
Oliver Neukum 51e148
+	return (u8)FIELD_GET(DFH_REVISION, readq(base + DFH));
Oliver Neukum 51e148
+}
Oliver Neukum 51e148
+
Oliver Neukum 51e148
 /**
Oliver Neukum 51e148
  * struct dfl_fpga_enum_info - DFL FPGA enumeration information
Oliver Neukum 51e148
  *