Add dt bindings for flexnoc Performance Monitor.
The flexnoc counters for read and write response and requests are
supported.
Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
.../devicetree/bindings/misc/xlnx,flexnoc.txt | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
diff --git a/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
new file mode 100644
index 0000000..6b533bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
@@ -0,0 +1,24 @@
+* Xilinx Flexnoc Performance Monitor driver
+
+The FlexNoc Performance Monitor has counters for monitoring
+the read and the write transaction counter.
+
+Required properties:
+- compatible: "xlnx,flexnoc-pm-2.7"
+- reg : Address and length of register sets for each device in
+ "reg-names"
+- reg-names : The names of the register addresses corresponding to the
+ registers filled in "reg"
+ - funnel: base address of the funnel registers
+ - baselpd: base address of the LPD PM registers
+ - basefpd: base address FPD PM registers
+
+Example:
+++++++++
+performance-monitor@f0920000 {
+ compatible = "xlnx,flexnoc-pm-2.7";
+ reg-names = "funnel", "baselpd", "basefpd";
+ reg = <0x0 0xf0920000 0x0 0x1000>,
+ <0x0 0xf0980000 0x0 0x9000>,
+ <0x0 0xf0b80000 0x0 0x9000>;
+};
--
2.1.1
This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
Add short documentation for FlexNoc Performance Monitor driver.
Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
v2:
patch added
Documentation/misc-devices/xilinx_flex.txt | 66 ++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 Documentation/misc-devices/xilinx_flex.txt
diff --git a/Documentation/misc-devices/xilinx_flex.txt b/Documentation/misc-devices/xilinx_flex.txt
new file mode 100644
index 0000000..c075934
--- /dev/null
+++ b/Documentation/misc-devices/xilinx_flex.txt
@@ -0,0 +1,66 @@
+Kernel driver xilinx_flex
+============================
+
+Supported chips:
+Versal SOC
+
+Author:
+ Shubhrajyoti Datta <[email protected]>
+
+Description
+-----------
+
+Versal uses the Arteris FlexNoC interconnect instead of the ARM NIC. FlexNoC
+provides the capability to integrate performance counters in the interconnect.
+It has configurable probe points to monitor the packet and forwards it to
+observer for logging. It supports read and write transaction counts for
+request and response.
+
+Features:
+---> Run-time programmable selection of packet probe points.
+---> Recording of traffic and link statistics.
+---> Separate read and write response and request count.
+
+SYSFS:
+
+counteridfpd
+ RW - shows the counter number selected for the FPD Flexnoc.
+
+counterfpd_rdreq
+ RO - shows the read request count for the FPD counters.
+
+counterfpdsrc
+ WO - sets the source of the FPD counter.
+
+counterfpd_wrrsp
+ RO - shows the write response count for the FPD counters.
+
+counterfpd_rdrsp
+ RO - shows the read response count for the FPD counters.
+
+counterfpd_wrreq
+ RO - shows the write request count for the FPD counters.
+
+counterfpdport
+ WO - sets the port number selected for the FPD Flexnoc.
+
+counteridlpd
+ RW - shows the counter number selected for the LPD Flexnoc.
+
+counterlpdport
+ WO - sets the port number selected for the LPD Flexnoc.
+
+counterlpd_rdreq
+ RO - shows the read request count for the LPD counters.
+
+counterlpd_wrreq
+ RO - shows the write request count for the LPD counters.
+
+counterlpd_wrrsp
+ RO - shows the write response count for the LPD counters.
+
+counterlpdsrc
+ WO - sets the source of the LPD counter.
+
+counterlpd_rdrsp
+ RO - shows the read response count for the LPD counters.
--
2.1.1
This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
Add support for the FlexNoc Performance Monitor.
Adds support for various port setting and monitoring
the packets transactions. It supports LPD and FPD monitoring
counters for read and write transaction requests and responses.
Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
v2:
Add a mutex to prevent race
---
drivers/misc/Kconfig | 9 +
drivers/misc/Makefile | 1 +
drivers/misc/xilinx_flex_pm.c | 653 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 663 insertions(+)
create mode 100644 drivers/misc/xilinx_flex_pm.c
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c55b637..1e9a6fa 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -454,6 +454,15 @@ config XILINX_SDFEC
If unsure, say N.
+config XILINX_FLEX_PM
+ tristate "Xilinx Flexnoc Performance Monitor"
+ help
+ This option enables support for the Xilinx Flex Noc Performance Monitor driver.
+ It monitors the read and write transactions. It has counters for the LPD and
+ FPD domains.
+
+ If unsure, say N
+
config MISC_RTSX
tristate
default MISC_RTSX_PCI || MISC_RTSX_USB
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index c1860d3..1f1c34d 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -57,3 +57,4 @@ obj-y += cardreader/
obj-$(CONFIG_PVPANIC) += pvpanic.o
obj-$(CONFIG_HABANA_AI) += habanalabs/
obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o
+obj-$(CONFIG_XILINX_FLEX_PM) += xilinx_flex_pm.o
diff --git a/drivers/misc/xilinx_flex_pm.c b/drivers/misc/xilinx_flex_pm.c
new file mode 100644
index 0000000..e7684d1
--- /dev/null
+++ b/drivers/misc/xilinx_flex_pm.c
@@ -0,0 +1,653 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Xilinx Flex Noc Performance Monitor driver.
+ * Copyright (c) 2019 Xilinx Inc.
+ */
+
+#include <linux/firmware/xlnx-zynqmp.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#define to_xflex_dev_info(n) ((struct xflex_dev_info *)dev_get_drvdata(n))
+
+#define FPM_LAR_OFFSET 0xFB0
+#define FPM_UNLOCK 0xC5ACCE55
+
+#define FPM_RD_REQ_OFFSET 0x1000
+#define FPM_RD_RES_OFFSET 0x2000
+#define FPM_WR_REQ_OFFSET 0x3000
+#define FPM_WR_RES_OFFSET 0x4000
+
+#define FPM_PORT_SEL_OFFSET 0x134
+#define FPM_MAIN_CTRL_OFFSET 0x008
+#define FPM_SRC_SEL_OFFSET 0x138
+#define FPM_STATPERIOD 0x24
+#define FPM_CFGCTRL 0x0C
+#define FPM_LPD 0x4210002
+#define FPM_FPD 0x420c003
+
+#define FPM_VAL 0x300
+#define FPM_SRC 0x200
+#define FPM_WRRSP_L 0x70000
+#define FPM_WRREQ_L 0x60000
+#define FPM_RDRSP_L 0x50000
+#define FPM_RDREQ_L 0x40000
+#define FPM_PROBE_SHIFT 16
+#define FPM_COUNTER_OFFSET 0x14
+#define FPM_GLOBALEN BIT(0)
+#define FPM_STATEN BIT(3)
+#define FPM_STATCOND_DUMP BIT(5)
+#define FPM_NUM_COUNTERS 4
+#define FPM_MAINCTL_DIS 0
+
+#define FPM_SRC_OFF 0x0
+#define FPM_SRC_CYCLE 0x1
+#define FPM_SRC_IDLE 0x2
+#define FPM_SRC_XFER 0x3
+#define FPM_SRC_BUSY 0x4
+#define FPM_SRC_WAIT 0x5
+#define FPM_SRC_PACKET 0x6
+
+/* Port values */
+#define FPM_PORT_LPD_AFIFS_AXI 0x0
+#define FPM_PORT_LPD_OCM 0x1
+#define FPM_PORT_LPD_OCMEXT 0x2
+#define FPM_PORT_PMC_RPU_AXI0 0x3
+
+#define FPM_PORT_FPDAXI 0x1
+#define FPM_PORT_PROTXPPU 0x2
+
+/**
+ * struct xflex_dev_info - Global Driver structure
+ * @dev: Device structure
+ * @baselpd: Iomapped LPD base address
+ * @basefpd: Iomapped FPD base address
+ * @funnel: Iomapped funnel register base address
+ * @counterid_lpd: LPD counter id
+ * @counterid_fpd: FPD counter id
+ */
+struct xflex_dev_info {
+ struct device *dev;
+ void __iomem *baselpd;
+ void __iomem *basefpd;
+ void __iomem *funnel;
+ u32 counterid_fpd;
+ u32 counterid_lpd;
+ struct mutex mutex; /* avoid parallel access to device */
+};
+
+/**
+ * enum xflex_sysfs_cmd_codes - sysfs command codes
+ * @XFLEX_GET_COUNTER_FPD: get the FPD counter value
+ * @XFLEX_SET_COUNTER_FPD: set the FPD counter value
+ * @XFLEX_GET_COUNTER_FPD_RDREQ: get the FPD read request count
+ * @XFLEX_GET_COUNTER_FPD_RDRSP: get the FPD read response count
+ * @XFLEX_GET_COUNTER_FPD_WRREQ: get the FPD write request count
+ * @XFLEX_GET_COUNTER_FPD_WRRSP: get the FPD write response count
+ * @XFLEX_GET_COUNTER_LPD_RDREQ: get the LPD read request count
+ * @XFLEX_GET_COUNTER_LPD_RDRSP: get the LPD read response count
+ * @XFLEX_GET_COUNTER_LPD_WRREQ: get the LPD write request count
+ * @XFLEX_GET_COUNTER_LPD_WRRSP: get the LPD write response count
+ * @XFLEX_SET_COUNTER_LPD: set the LPD counter value
+ * @XFLEX_SET_SRC_COUNTER_LPD: set the LPD source
+ * @XFLEX_SET_SRC_COUNTER_FPD: set the FPD source
+ * @XFLEX_SET_PORT_COUNTER_LPD: set the LPD port
+ * @XFLEX_SET_PORT_COUNTER_FPD: set the FPD port
+ */
+enum xflex_sysfs_cmd_codes {
+ XFLEX_GET_COUNTER_FPD = 0,
+ XFLEX_SET_COUNTER_FPD,
+ XFLEX_GET_COUNTER_FPD_RDREQ,
+ XFLEX_GET_COUNTER_FPD_RDRSP,
+ XFLEX_GET_COUNTER_FPD_WRREQ,
+ XFLEX_GET_COUNTER_FPD_WRRSP,
+ XFLEX_GET_COUNTER_LPD_RDREQ,
+ XFLEX_GET_COUNTER_LPD_RDRSP,
+ XFLEX_GET_COUNTER_LPD_WRREQ,
+ XFLEX_GET_COUNTER_LPD_WRRSP,
+ XFLEX_SET_COUNTER_LPD,
+ XFLEX_SET_SRC_COUNTER_LPD,
+ XFLEX_SET_SRC_COUNTER_FPD,
+ XFLEX_SET_PORT_COUNTER_LPD,
+ XFLEX_SET_PORT_COUNTER_FPD,
+};
+
+static inline void fpm_reg(void __iomem *base, u32 val, u32 offset)
+{
+ writel(val, base + FPM_RD_REQ_OFFSET + offset);
+ writel(val, base + FPM_RD_RES_OFFSET + offset);
+ writel(val, base + FPM_WR_REQ_OFFSET + offset);
+ writel(val, base + FPM_WR_RES_OFFSET + offset);
+}
+
+static void reset_default(struct device *dev, u32 counter, u32 domain)
+{
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+ void __iomem *base = flexpm->basefpd;
+ u32 offset;
+
+ if (domain == FPM_LPD)
+ base = flexpm->baselpd;
+
+ fpm_reg(base, FPM_MAINCTL_DIS, FPM_MAIN_CTRL_OFFSET);
+ fpm_reg(base, FPM_STATEN | FPM_STATCOND_DUMP, FPM_MAIN_CTRL_OFFSET);
+ fpm_reg(base, FPM_STATEN | FPM_STATCOND_DUMP, FPM_MAIN_CTRL_OFFSET);
+
+ offset = FPM_PORT_SEL_OFFSET + counter * FPM_COUNTER_OFFSET;
+ fpm_reg(base, FPM_PORT_LPD_OCM, offset);
+ offset = FPM_SRC_SEL_OFFSET + counter * FPM_COUNTER_OFFSET;
+ fpm_reg(base, FPM_SRC_PACKET, offset);
+
+ fpm_reg(base, 0, FPM_STATPERIOD);
+ fpm_reg(base, FPM_GLOBALEN, FPM_CFGCTRL);
+}
+
+/**
+ * xflex_sysfs_cmd - Implements sysfs operations
+ * @dev: Device structure
+ * @buf: Value to write
+ * @cmd: sysfs cmd
+ *
+ * Return: value read from the sysfs cmd on success and negative error code
+ * otherwise.
+ */
+static int xflex_sysfs_cmd(struct device *dev, const char *buf,
+ enum xflex_sysfs_cmd_codes cmd)
+{
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+ u32 domain, src, offset, reg, val, counter;
+ int ret;
+ const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
+ u32 rdval = 0;
+ u32 pm_api_ret[4] = {0, 0, 0, 0};
+
+ if (IS_ERR_OR_NULL(eemi_ops))
+ return PTR_ERR(eemi_ops);
+
+ if (!eemi_ops->ioctl)
+ return -ENOTSUPP;
+
+ switch (cmd) {
+ case XFLEX_GET_COUNTER_LPD_WRRSP:
+ reg = flexpm->counterid_lpd | FPM_WRRSP_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_LPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_LPD_WRREQ:
+ reg = flexpm->counterid_lpd | FPM_WRREQ_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_LPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_LPD_RDRSP:
+ reg = flexpm->counterid_lpd | FPM_RDRSP_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_LPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_LPD_RDREQ:
+ reg = flexpm->counterid_lpd | FPM_RDREQ_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_LPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_SET_COUNTER_LPD:
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ flexpm->counterid_lpd = val;
+ reset_default(dev, val, FPM_LPD);
+ break;
+
+ case XFLEX_SET_PORT_COUNTER_FPD:
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ counter = flexpm->counterid_fpd * FPM_COUNTER_OFFSET;
+ offset = FPM_PORT_SEL_OFFSET + counter * FPM_COUNTER_OFFSET;
+ fpm_reg(flexpm->basefpd, val, offset);
+ break;
+
+ case XFLEX_SET_PORT_COUNTER_LPD:
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ counter = flexpm->counterid_lpd * FPM_COUNTER_OFFSET;
+ offset = FPM_PORT_SEL_OFFSET + counter * FPM_COUNTER_OFFSET;
+ fpm_reg(flexpm->baselpd, val, offset);
+ break;
+
+ case XFLEX_SET_SRC_COUNTER_LPD:
+ reg = flexpm->counterid_lpd;
+ domain = FPM_LPD;
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ for (src = 0; src < FPM_NUM_COUNTERS; src++) {
+ reg = reg | FPM_SRC | (src << FPM_PROBE_SHIFT);
+ ret = eemi_ops->ioctl(domain, IOCTL_PROBE_COUNTER_WRITE,
+ reg, val, NULL);
+ if (ret < 0) {
+ dev_err(dev, "Counter write error %d\n", ret);
+ goto exit_unlock;
+ }
+ }
+ break;
+
+ case XFLEX_SET_SRC_COUNTER_FPD:
+ reg = flexpm->counterid_fpd;
+ domain = FPM_FPD;
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ for (src = 0; src < FPM_NUM_COUNTERS; src++) {
+ reg = reg | FPM_SRC | (src << FPM_PROBE_SHIFT);
+ ret = eemi_ops->ioctl(domain, IOCTL_PROBE_COUNTER_WRITE,
+ reg, val, NULL);
+ if (ret < 0) {
+ dev_err(dev, "Counter write error %d\n", ret);
+ goto exit_unlock;
+ }
+ }
+ break;
+
+ case XFLEX_SET_COUNTER_FPD:
+ ret = kstrtou32(buf, 0, &val);
+ if (ret < 0)
+ goto exit_unlock;
+
+ flexpm->counterid_fpd = val;
+ reset_default(dev, val, FPM_FPD);
+ break;
+
+ case XFLEX_GET_COUNTER_FPD_WRRSP:
+ reg = flexpm->counterid_fpd | FPM_WRRSP_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_FPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_FPD_WRREQ:
+ reg = flexpm->counterid_fpd | FPM_WRREQ_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_FPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_FPD_RDRSP:
+ reg = flexpm->counterid_fpd | FPM_RDRSP_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_FPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ case XFLEX_GET_COUNTER_FPD_RDREQ:
+ reg = flexpm->counterid_fpd | FPM_RDREQ_L | FPM_VAL;
+ ret = eemi_ops->ioctl(FPM_FPD, IOCTL_PROBE_COUNTER_READ,
+ reg, 0, &pm_api_ret[0]);
+ if (ret < 0) {
+ dev_err(dev, "Counter read error %d\n", ret);
+ goto exit_unlock;
+ }
+
+ rdval = pm_api_ret[1];
+ break;
+
+ default:
+ dev_err(dev, "Invalid option\n");
+ break;
+ }
+
+ return rdval;
+
+exit_unlock:
+ mutex_unlock(&flexpm->lock);
+ return ret;
+}
+
+/* Sysfs functions */
+
+static ssize_t counterfpd_wrreq_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_FPD_WRREQ);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterfpd_wrreq);
+
+static ssize_t counterfpd_wrrsp_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_FPD_WRRSP);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterfpd_wrrsp);
+
+static ssize_t counterfpd_rdreq_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_FPD_RDREQ);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterfpd_rdreq);
+
+static ssize_t counterfpd_rdrsp_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_FPD_RDRSP);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterfpd_rdrsp);
+
+static ssize_t counterlpd_wrreq_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_LPD_WRREQ);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterlpd_wrreq);
+
+static ssize_t counterlpd_wrrsp_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_LPD_WRRSP);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterlpd_wrrsp);
+
+static ssize_t counterlpd_rdreq_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_LPD_RDREQ);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterlpd_rdreq);
+
+static ssize_t counterlpd_rdrsp_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int rdval = xflex_sysfs_cmd(dev, buf, XFLEX_GET_COUNTER_LPD_RDRSP);
+
+ if (rdval < 0)
+ return 0;
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", rdval);
+}
+static DEVICE_ATTR_RO(counterlpd_rdrsp);
+
+static ssize_t counterlpdsrc_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ xflex_sysfs_cmd(dev, buf, XFLEX_SET_SRC_COUNTER_LPD);
+
+ return size;
+}
+static DEVICE_ATTR_WO(counterlpdsrc);
+
+static ssize_t counterfpdsrc_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ xflex_sysfs_cmd(dev, buf, XFLEX_SET_SRC_COUNTER_FPD);
+
+ return size;
+}
+static DEVICE_ATTR_WO(counterfpdsrc);
+
+static ssize_t counterlpdport_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ xflex_sysfs_cmd(dev, buf, XFLEX_SET_PORT_COUNTER_LPD);
+
+ return size;
+}
+static DEVICE_ATTR_WO(counterlpdport);
+
+static ssize_t counterfpdport_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ xflex_sysfs_cmd(dev, buf, XFLEX_SET_PORT_COUNTER_FPD);
+
+ return size;
+}
+static DEVICE_ATTR_WO(counterfpdport);
+
+static ssize_t counteridlpd_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+
+ return snprintf(buf, PAGE_SIZE, "%08d\n", flexpm->counterid_lpd);
+}
+
+static ssize_t counteridlpd_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ int ret;
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+
+ ret = kstrtou32(buf, 0, &flexpm->counterid_lpd);
+ if (ret < 0)
+ return ret;
+
+ reset_default(dev, flexpm->counterid_lpd, FPM_LPD);
+
+ return size;
+}
+static DEVICE_ATTR_RW(counteridlpd);
+
+static ssize_t counteridfpd_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+
+ return snprintf(buf, PAGE_SIZE, "%08d\n", flexpm->counterid_fpd);
+}
+
+static ssize_t counteridfpd_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t size)
+{
+ int ret;
+ struct xflex_dev_info *flexpm = to_xflex_dev_info(dev);
+
+ ret = kstrtou32(buf, 0, &flexpm->counterid_fpd);
+ if (ret < 0)
+ return ret;
+
+ return size;
+}
+static DEVICE_ATTR_RW(counteridfpd);
+
+static struct attribute *xflex_attrs[] = {
+ &dev_attr_counterlpdsrc.attr,
+ &dev_attr_counterlpdport.attr,
+ &dev_attr_counterfpdsrc.attr,
+ &dev_attr_counterfpdport.attr,
+
+ &dev_attr_counterlpd_rdreq.attr,
+ &dev_attr_counterlpd_wrreq.attr,
+ &dev_attr_counterlpd_rdrsp.attr,
+ &dev_attr_counterlpd_wrrsp.attr,
+
+ &dev_attr_counterfpd_rdreq.attr,
+ &dev_attr_counterfpd_wrreq.attr,
+ &dev_attr_counterfpd_rdrsp.attr,
+ &dev_attr_counterfpd_wrrsp.attr,
+
+ &dev_attr_counteridlpd.attr,
+ &dev_attr_counteridfpd.attr,
+ NULL,
+};
+
+ATTRIBUTE_GROUPS(xflex);
+
+/**
+ * xflex_probe - Driver probe function
+ * @pdev: Pointer to the platform_device structure
+ *
+ * This is the driver probe routine. It does all the memory
+ * allocation and creates sysfs entries for the device.
+ *
+ * Return: 0 on success and failure value on error
+ */
+static int xflex_probe(struct platform_device *pdev)
+{
+ struct xflex_dev_info *flexpm;
+ struct resource *res;
+ int err;
+ struct device *dev = &pdev->dev;
+
+ flexpm = devm_kzalloc(dev, sizeof(*flexpm), GFP_KERNEL);
+ if (!flexpm)
+ return -ENOMEM;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "baselpd");
+ flexpm->baselpd = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(flexpm->baselpd))
+ return PTR_ERR(flexpm->baselpd);
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "basefpd");
+ flexpm->basefpd = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(flexpm->basefpd))
+ return PTR_ERR(flexpm->basefpd);
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "funnel");
+ flexpm->funnel = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(flexpm->funnel))
+ return PTR_ERR(flexpm->funnel);
+
+ mutex_init(&flexpm->lock);
+ writel(FPM_UNLOCK, flexpm->funnel + FPM_LAR_OFFSET);
+ writel(FPM_UNLOCK, flexpm->baselpd + FPM_LAR_OFFSET);
+
+ /* Create sysfs file entries for the device */
+ err = sysfs_create_groups(&dev->kobj, xflex_groups);
+ if (err < 0) {
+ dev_err(dev, "unable to create sysfs entries\n");
+ return err;
+ }
+
+ dev_set_drvdata(dev, flexpm);
+
+ return 0;
+}
+
+/**
+ * xflex_remove - Driver remove function
+ * @pdev: Pointer to the platform_device structure
+ *
+ * This function frees all the resources allocated to the device.
+ *
+ * Return: 0 always
+ */
+static int xflex_remove(struct platform_device *pdev)
+{
+ sysfs_remove_groups(&pdev->dev.kobj, xflex_groups);
+ return 0;
+}
+
+static const struct of_device_id xflex_of_match[] = {
+ { .compatible = "xlnx,flexnoc-pm-2.7", },
+ { /* end of table */ }
+};
+MODULE_DEVICE_TABLE(of, xflex_of_match);
+
+static struct platform_driver xflex_driver = {
+ .driver = {
+ .name = "xilinx-flex",
+ .of_match_table = xflex_of_match,
+ },
+ .probe = xflex_probe,
+ .remove = xflex_remove,
+};
+
+module_platform_driver(xflex_driver);
+
+MODULE_AUTHOR("Shubhrajyoti Datta <[email protected]>");
+MODULE_DESCRIPTION("Xilinx Flexnoc performance monitor driver");
+MODULE_LICENSE("GPL v2");
--
2.1.1
This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
On Thu, Sep 26, 2019 at 10:46:24AM +0530, Shubhrajyoti Datta wrote:
> Add dt bindings for flexnoc Performance Monitor.
> The flexnoc counters for read and write response and requests are
> supported.
>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>
> ---
> .../devicetree/bindings/misc/xlnx,flexnoc.txt | 24 ++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
<snip>
Why are these "RFC"?
I guess you don't want them merged because you are not thinking that
they are good enough? What needs to be done on them that you are
sending them out now?
greg k-h
On Thu, Sep 26, 2019 at 10:46:24AM +0530, Shubhrajyoti Datta wrote:
> Add dt bindings for flexnoc Performance Monitor.
> The flexnoc counters for read and write response and requests are
> supported.
>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>
> ---
> .../devicetree/bindings/misc/xlnx,flexnoc.txt | 24 ++++++++++++++++++++++
bindings/perf/
Please convert this to a schema. See
Documentation/devicetree/writing-schema.rst.
> 1 file changed, 24 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
>
> diff --git a/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> new file mode 100644
> index 0000000..6b533bc
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> @@ -0,0 +1,24 @@
> +* Xilinx Flexnoc Performance Monitor driver
Bindings are for h/w blocks, not drivers.
> +
> +The FlexNoc Performance Monitor has counters for monitoring
> +the read and the write transaction counter.
> +
> +Required properties:
> +- compatible: "xlnx,flexnoc-pm-2.7"
> +- reg : Address and length of register sets for each device in
> + "reg-names"
> +- reg-names : The names of the register addresses corresponding to the
> + registers filled in "reg"
> + - funnel: base address of the funnel registers
> + - baselpd: base address of the LPD PM registers
> + - basefpd: base address FPD PM registers
Is this really all one h/w block.
FlexNoC is an interconnect, right? Is there more to it than just
perfmon?
> +
> +Example:
> +++++++++
> +performance-monitor@f0920000 {
> + compatible = "xlnx,flexnoc-pm-2.7";
> + reg-names = "funnel", "baselpd", "basefpd";
> + reg = <0x0 0xf0920000 0x0 0x1000>,
> + <0x0 0xf0980000 0x0 0x9000>,
> + <0x0 0xf0b80000 0x0 0x9000>;
> +};
> --
> 2.1.1
>
> This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
We can't accept confidential emails.
Rob
Hi,
> -----Original Message-----
> From: Rob Herring <[email protected]>
> Sent: Friday, October 11, 2019 3:19 AM
> To: Shubhrajyoti Datta <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; Michal Simek
> <[email protected]>
> Subject: Re: [RFC PATCHv2 1/3] dt-bindings: misc: Add dt bindings for flex noc
> Performance Monitor
>
> On Thu, Sep 26, 2019 at 10:46:24AM +0530, Shubhrajyoti Datta wrote:
> > Add dt bindings for flexnoc Performance Monitor.
> > The flexnoc counters for read and write response and requests are
> > supported.
> >
> > Signed-off-by: Shubhrajyoti Datta <[email protected]>
> > ---
> > .../devicetree/bindings/misc/xlnx,flexnoc.txt | 24
> ++++++++++++++++++++++
>
> bindings/perf/
>
> Please convert this to a schema. See
> Documentation/devicetree/writing-schema.rst.
Ok
>
> > 1 file changed, 24 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> >
> > diff --git a/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> > b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> > new file mode 100644
> > index 0000000..6b533bc
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/misc/xlnx,flexnoc.txt
> > @@ -0,0 +1,24 @@
> > +* Xilinx Flexnoc Performance Monitor driver
>
> Bindings are for h/w blocks, not drivers.
Wil change
>
> > +
> > +The FlexNoc Performance Monitor has counters for monitoring the read
> > +and the write transaction counter.
> > +
> > +Required properties:
> > +- compatible: "xlnx,flexnoc-pm-2.7"
> > +- reg : Address and length of register sets for each device in
> > + "reg-names"
> > +- reg-names : The names of the register addresses corresponding to the
> > + registers filled in "reg"
> > + - funnel: base address of the funnel registers
> > + - baselpd: base address of the LPD PM registers
> > + - basefpd: base address FPD PM registers
>
> Is this really all one h/w block.
>
> FlexNoC is an interconnect, right? Is there more to it than just perfmon?
Yes , however the driver only uses the monitoring part.
>
> > +