From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: eajames@linux.ibm.com, linux-kernel@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org,
broonie@kernel.org, andi.shyti@kernel.org, joel@jms.id.au,
alistair@popple.id.au, jk@ozlabs.org,
andrew@codeconstruct.com.au, linux-aspeed@lists.ozlabs.org,
ninad@linux.ibm.com, lakshmiy@us.ibm.com
Subject: [PATCH v4 25/40] fsi: hub: Add interrupt support
Date: Wed, 5 Jun 2024 16:22:57 -0500 [thread overview]
Message-ID: <20240605212312.349188-26-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240605212312.349188-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 91ad6b7728fa2..4dbc542500bbd 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);
}
@@ -135,6 +209,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);
@@ -142,9 +217,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
@@ -156,6 +266,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
next prev parent reply other threads:[~2024-06-05 21:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 21:22 [PATCH v4 00/40] fsi: Add interrupt support Eddie James
2024-06-05 21:22 ` [PATCH v4 01/40] fsi: hub: Set master index to link number plus one Eddie James
2024-06-05 21:22 ` [PATCH v4 02/40] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-06-05 21:22 ` [PATCH v4 03/40] fsi: Fix slave addressing after break command Eddie James
2024-06-05 21:22 ` [PATCH v4 04/40] fsi: Use a defined value for default echo delay Eddie James
2024-06-05 21:22 ` [PATCH v4 05/40] fsi: Calculate local bus clock frequency Eddie James
2024-06-05 21:22 ` [PATCH v4 06/40] fsi: core: Improve master read/write/error traces Eddie James
2024-06-05 21:22 ` [PATCH v4 07/40] fsi: core: Add slave error trace Eddie James
2024-06-05 21:22 ` [PATCH v4 08/40] fsi: core: Reset errors instead of clearing interrupts Eddie James
2024-06-05 21:22 ` [PATCH v4 09/40] fsi: aspeed: Add AST2700 support Eddie James
2024-06-05 21:22 ` [PATCH v4 10/40] fsi: core: Add slave spinlock Eddie James
2024-06-05 21:22 ` [PATCH v4 11/40] fsi: core: Allow cfam device type aliases Eddie James
2024-06-05 21:22 ` [PATCH v4 12/40] fsi: core: Add common regmap master functions Eddie James
2024-06-05 21:22 ` [PATCH v4 13/40] fsi: core: Disable relative addressing during scan Eddie James
2024-06-05 21:22 ` [PATCH v4 14/40] fsi: hub: Use common initialization and link enable Eddie James
2024-06-05 21:22 ` [PATCH v4 15/40] fsi: aspeed: " Eddie James
2024-06-05 21:22 ` [PATCH v4 16/40] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-06-05 21:22 ` [PATCH v4 17/40] fsi: aspeed: Refactor trace functions Eddie James
2024-06-05 21:22 ` [PATCH v4 18/40] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-06-05 21:22 ` [PATCH v4 19/40] fsi: aspeed: Only read result register for successful read Eddie James
2024-06-05 21:22 ` [PATCH v4 20/40] fsi: aspeed: Switch to spinlock Eddie James
2024-06-05 21:22 ` [PATCH v4 21/40] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-06-05 21:22 ` [PATCH v4 22/40] fsi: aspeed: Use common master error handler Eddie James
2024-06-05 21:22 ` [PATCH v4 23/40] fsi: core: Add interrupt support Eddie James
2024-06-05 21:22 ` [PATCH v4 24/40] fsi: aspeed: " Eddie James
2024-06-05 21:22 ` Eddie James [this message]
2024-06-05 21:22 ` [PATCH v4 26/40] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-06-05 21:22 ` [PATCH v4 27/40] i2c: fsi: Improve formatting Eddie James
2024-06-05 21:23 ` [PATCH v4 28/40] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer Eddie James
2024-06-05 21:23 ` [PATCH v4 29/40] i2c: fsi: Remove list structure of ports Eddie James
2024-06-05 21:23 ` [PATCH v4 30/40] i2c: fsi: Define a function to check status error bits Eddie James
2024-06-05 21:23 ` [PATCH v4 31/40] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-06-05 21:23 ` [PATCH v4 32/40] i2c: fsi: Add interrupt support Eddie James
2024-06-05 21:23 ` [PATCH v4 33/40] fsi: hub master: Reset hub master after errors Eddie James
2024-06-05 21:23 ` [PATCH v4 34/40] fsi: core: Add master register read-only sysfs Eddie James
2024-06-05 21:23 ` [PATCH v4 35/40] fsi: core: Add slave " Eddie James
2024-06-05 21:23 ` [PATCH v4 36/40] fsi: i2cr: Adjust virtual CFAM ID to match Odyssey chip Eddie James
2024-06-05 21:23 ` [PATCH v4 37/40] fsi: core: Add different types of CFAM Eddie James
2024-06-05 21:23 ` [PATCH v4 38/40] spi: fsi: Calculate clock divider from local bus frequency Eddie James
2024-06-05 21:23 ` [PATCH v4 39/40] ARM: dts: aspeed: P10 and tacoma: Set FSI clock frequency Eddie James
2024-06-05 21:23 ` [PATCH v4 40/40] ARM: dts: aspeed: P10: Bump SPI max frequencies Eddie James
2024-06-06 1:02 ` [PATCH v4 00/40] fsi: Add interrupt support Andrew Jeffery
2024-07-01 15:29 ` Eddie James
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=20240605212312.349188-26-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andi.shyti@kernel.org \
--cc=andrew@codeconstruct.com.au \
--cc=broonie@kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=lakshmiy@us.ibm.com \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=ninad@linux.ibm.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;
as well as URLs for NNTP newsgroup(s).