devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
	devicetree@vger.kernel.org, andi.shyti@kernel.org,
	eajames@linux.ibm.com, alistair@popple.id.au, joel@jms.id.au,
	jk@ozlabs.org, robh@kernel.org,
	krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
	lakshmiy@us.ibmcom
Subject: [PATCH v2 24/31] fsi: hub: Add interrupt support
Date: Mon, 26 Feb 2024 10:53:14 -0600	[thread overview]
Message-ID: <20240226165321.91976-25-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240226165321.91976-1-eajames@linux.ibm.com>

The hub master receives it's interrupts from the local slave register
space, which is handled in the FSI core. Therefore, just route the remote
slave interrupts to the hub link device interrupts.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 drivers/fsi/fsi-master-hub.c | 119 ++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 3 deletions(-)

diff --git a/drivers/fsi/fsi-master-hub.c b/drivers/fsi/fsi-master-hub.c
index 92aa07055c56..4c3f77ae1faf 100644
--- a/drivers/fsi/fsi-master-hub.c
+++ b/drivers/fsi/fsi-master-hub.c
@@ -7,8 +7,10 @@
 
 #include <linux/delay.h>
 #include <linux/fsi.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
@@ -35,9 +37,10 @@
  */
 struct fsi_master_hub {
 	struct fsi_master	master;
+	struct irq_domain	*irq_domain;
 	struct fsi_device	*upstream;
-	uint32_t		addr, size;	/* slave-relative addr of */
-						/* master address space */
+	uint32_t		addr;
+	uint32_t		size;
 };
 
 #define to_fsi_master_hub(m) container_of(m, struct fsi_master_hub, master)
@@ -77,10 +80,81 @@ static int hub_master_break(struct fsi_master *master, int link)
 	return hub_master_write(master, link, 0, addr, &cmd, sizeof(cmd));
 }
 
+static int hub_master_link_enable(struct fsi_master *master, int link,
+				  bool enable)
+{
+	struct fsi_master_hub *hub = to_fsi_master_hub(master);
+	u32 srsim = 0xff000000 >> (8 * (link % 4));
+	int slave_idx = 4 * (link / 4);
+	__be32 srsim_be;
+	int ret;
+
+	ret = fsi_slave_read(hub->upstream->slave, FSI_SLAVE_BASE + FSI_SRSIM0 + slave_idx,
+			     &srsim_be, sizeof(srsim_be));
+	if (ret)
+		return ret;
+
+	if (enable) {
+		ret = fsi_master_link_enable(master, link, enable);
+		if (ret)
+			return ret;
+
+		srsim |= be32_to_cpu(srsim_be);
+		srsim_be = cpu_to_be32(srsim);
+		ret = fsi_slave_write(hub->upstream->slave,
+				      FSI_SLAVE_BASE + FSI_SRSIM0 + slave_idx, &srsim_be,
+				      sizeof(srsim_be));
+	} else {
+		srsim = be32_to_cpu(srsim_be) & ~srsim;
+		srsim_be = cpu_to_be32(srsim);
+		ret = fsi_slave_write(hub->upstream->slave,
+				      FSI_SLAVE_BASE + FSI_SRSIM0 + slave_idx, &srsim_be,
+				      sizeof(srsim_be));
+		if (ret)
+			return ret;
+
+		ret = fsi_master_link_enable(master, link, enable);
+	}
+
+	return ret;
+}
+
+static irqreturn_t hub_master_irq(int irq, void *data)
+{
+	struct fsi_master_hub *hub = data;
+	struct fsi_master *parent = hub->upstream->slave->master;
+	unsigned int link = 0;
+
+	for (; link < FSI_HUB_MASTER_MAX_LINKS; ++link) {
+		if (parent->remote_interrupt_status & (1 << link))
+			fsi_master_irq(&hub->master, hub->irq_domain, link);
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int hub_master_irqd_map(struct irq_domain *domain, unsigned int irq,
+			       irq_hw_number_t hwirq)
+{
+	struct fsi_master_hub *hub = domain->host_data;
+
+	irq_set_chip_and_handler(irq, &hub->master.irq_chip, handle_simple_irq);
+	irq_set_chip_data(irq, &hub->master);
+
+	return 0;
+}
+
+static const struct irq_domain_ops hub_master_irq_domain_ops = {
+	.map = hub_master_irqd_map,
+};
+
 static void hub_master_release(struct device *dev)
 {
 	struct fsi_master_hub *hub = to_fsi_master_hub(to_fsi_master(dev));
 
+	if (hub->irq_domain)
+		irq_domain_remove(hub->irq_domain);
+
 	regmap_exit(hub->master.map);
 	kfree(hub);
 }
@@ -136,6 +210,7 @@ static int hub_master_probe(struct device *dev)
 	hub->master.read = hub_master_read;
 	hub->master.write = hub_master_write;
 	hub->master.send_break = hub_master_break;
+	hub->master.link_enable = hub_master_link_enable;
 
 	dev_set_drvdata(dev, hub);
 
@@ -143,9 +218,44 @@ static int hub_master_probe(struct device *dev)
 	if (rc)
 		goto err_free;
 
+	if (of_property_read_bool(dev->of_node, "interrupt-controller")) {
+		struct device_node *parent = of_irq_find_parent(dev->of_node);
+
+		if (parent) {
+			struct irq_fwspec fwspec;
+			unsigned int irq;
+
+			fwspec.fwnode = of_node_to_fwnode(parent);
+			fwspec.param_count = 1;
+			fwspec.param[0] = (fsi_dev->slave->link * FSI_IRQ_COUNT) + 8;
+			irq = irq_create_fwspec_mapping(&fwspec);
+			if (irq) {
+				unsigned int size = links * FSI_IRQ_COUNT;
+
+				hub->irq_domain = irq_domain_add_linear(dev->of_node, size,
+									&hub_master_irq_domain_ops,
+									hub);
+
+				if (hub->irq_domain) {
+					rc = devm_request_irq(dev, irq, hub_master_irq, 0,
+							      dev_name(dev), hub);
+					if (rc) {
+						dev_warn(dev, "failed to request irq:%u\n", irq);
+						irq_domain_remove(hub->irq_domain);
+						hub->irq_domain = NULL;
+					} else {
+						dev_info(dev, "enabling interrupts irq:%u\n", irq);
+					}
+				} else {
+					dev_warn(dev, "failed to create irq domain\n");
+				}
+			}
+		}
+	}
+
 	rc = fsi_master_register(&hub->master);
 	if (rc)
-		goto err_free;
+		goto err_irq;
 
 	/* At this point, fsi_master_register performs the device_initialize(),
 	 * and holds the sole reference on master.dev. This means the device
@@ -157,6 +267,9 @@ static int hub_master_probe(struct device *dev)
 	get_device(&hub->master.dev);
 	return 0;
 
+err_irq:
+	if (hub->irq_domain)
+		irq_domain_remove(hub->irq_domain);
 err_free:
 	kfree(hub);
 err_release:
-- 
2.39.3


  parent reply	other threads:[~2024-02-26 16:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 16:52 [PATCH v2 00/31] fsi: Interrupt support Eddie James
2024-02-26 16:52 ` [PATCH v2 01/31] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-02-26 16:52 ` [PATCH v2 02/31] fsi: Improve master indexing Eddie James
2024-02-26 16:52 ` [PATCH v2 03/31] fsi: Use a defined value for default echo delay Eddie James
2024-02-26 16:52 ` [PATCH v2 04/31] fsi: Expose master-specific local bus clock divider Eddie James
2024-02-26 16:52 ` [PATCH v2 05/31] ARM: dts: aspeed: p10 and tacoma: Set FSI clock frequency Eddie James
2024-02-26 16:52 ` [PATCH v2 06/31] fsi: core: Improve master read/write/error traces Eddie James
2024-02-26 16:52 ` [PATCH v2 07/31] fsi: core: Add slave error trace Eddie James
2024-02-26 16:52 ` [PATCH v2 08/31] dt-bindings: fsi: Add AST2700 compatible Eddie James
2024-02-27  7:14   ` Krzysztof Kozlowski
2024-02-28 15:47   ` Rob Herring
2024-02-26 16:52 ` [PATCH v2 09/31] fsi: aspeed: Add AST2700 support Eddie James
2024-02-26 16:53 ` [PATCH v2 10/31] fsi: core: Add slave spinlock Eddie James
2024-02-26 16:53 ` [PATCH v2 11/31] fsi: core: Allow cfam device type aliases Eddie James
2024-02-26 16:53 ` [PATCH v2 12/31] fsi: core: Add common regmap master functions Eddie James
2024-02-26 16:53 ` [PATCH v2 13/31] fsi: hub: Use common initialization and link enable Eddie James
2024-02-26 16:53 ` [PATCH v2 14/31] fsi: aspeed: " Eddie James
2024-02-26 16:53 ` [PATCH v2 15/31] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-02-26 16:53 ` [PATCH v2 16/31] fsi: aspeed: Refactor trace functions Eddie James
2024-02-26 16:53 ` [PATCH v2 17/31] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-02-26 16:53 ` [PATCH v2 18/31] fsi: aspeed: Only read result register for successful read Eddie James
2024-02-26 16:53 ` [PATCH v2 19/31] fsi: aspeed: Switch to spinlock Eddie James
2024-02-26 16:53 ` [PATCH v2 20/31] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-02-26 16:53 ` [PATCH v2 21/31] fsi: aspeed: Use common master error handler Eddie James
2024-02-26 16:53 ` [PATCH v2 22/31] fsi: core: Add interrupt support Eddie James
2024-02-26 16:53 ` [PATCH v2 23/31] fsi: aspeed: " Eddie James
2024-02-26 16:53 ` Eddie James [this message]
2024-02-26 16:53 ` [PATCH v2 25/31] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-04-15 22:11   ` Andi Shyti
2024-04-16 18:09     ` Eddie James
2024-04-16 21:20       ` Guenter Roeck
2024-04-17 13:50         ` Eddie James
2024-02-26 16:53 ` [PATCH v2 26/31] i2c: fsi: Improve formatting Eddie James
2024-04-15 22:13   ` Andi Shyti
2024-02-26 16:53 ` [PATCH v2 27/31] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer Eddie James
2024-02-26 16:53 ` [PATCH v2 28/31] i2c: fsi: Remove list structure of ports Eddie James
2024-02-26 16:53 ` [PATCH v2 29/31] i2c: fsi: Define a function to check status error bits Eddie James
2024-02-26 16:53 ` [PATCH v2 30/31] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-02-26 16:53 ` [PATCH v2 31/31] i2c: fsi: Add interrupt support Eddie James
2024-02-27 13:44 ` [PATCH v2 00/31] fsi: Interrupt support Rob Herring

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=20240226165321.91976-25-eajames@linux.ibm.com \
    --to=eajames@linux.ibm.com \
    --cc=alistair@popple.id.au \
    --cc=andi.shyti@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jk@ozlabs.org \
    --cc=joel@jms.id.au \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lakshmiy@us.ibmcom \
    --cc=linux-fsi@lists.ozlabs.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh@kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).