From: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
To: Marc Zyngier <marc.zyngier@arm.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <helgaas@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
David Laight <david.laight@aculab.com>,
linux-pci <linux-pci@vger.kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
LKML <linux-kernel@vger.kernel.org>, Mason <slash.tmp@free.fr>
Subject: [PATCH v7 3/3] PCI: Add tango MSI controller support
Date: Wed, 14 Jun 2017 11:00:03 +0200 [thread overview]
Message-ID: <08d84ce3-5345-dc69-bbc3-37372a3df22b@sigmadesigns.com> (raw)
In-Reply-To: <1588fa00-92c6-046d-ccfc-9a2deae61486@arm.com>
The MSI controller in Tango supports 256 message-signaled interrupts,
and a single doorbell address.
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
Changes from v6 to v7
o Call spin_lock() not spin_lock_irqsave() in the ISR
---
drivers/pci/host/pcie-tango.c | 225 ++++++++++++++++++++++++++++++++++++++=
++++
1 file changed, 225 insertions(+)
diff --git a/drivers/pci/host/pcie-tango.c b/drivers/pci/host/pcie-tango.c
index 67aaadcc1c5e..d4b3520b5a03 100644
--- a/drivers/pci/host/pcie-tango.c
+++ b/drivers/pci/host/pcie-tango.c
@@ -1,16 +1,228 @@
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>
#include <linux/pci-ecam.h>
#include <linux/delay.h>
+#include <linux/msi.h>
#include <linux/of.h>
=20
#define MSI_MAX 256
=20
#define SMP8759_MUX=09=090x48
#define SMP8759_TEST_OUT=090x74
+#define SMP8759_STATUS=09=090x80
+#define SMP8759_ENABLE=09=090xa0
+#define SMP8759_DOORBELL=090xa002e07c
=20
struct tango_pcie {
+=09DECLARE_BITMAP(used_msi, MSI_MAX);
+=09spinlock_t used_msi_lock;
=09void __iomem *mux;
+=09void __iomem *msi_status;
+=09void __iomem *msi_enable;
+=09phys_addr_t msi_doorbell;
+=09struct irq_domain *irq_dom;
+=09struct irq_domain *msi_dom;
+=09int irq;
};
=20
+/*** MSI CONTROLLER SUPPORT ***/
+
+static void tango_msi_isr(struct irq_desc *desc)
+{
+=09struct irq_chip *chip =3D irq_desc_get_chip(desc);
+=09struct tango_pcie *pcie =3D irq_desc_get_handler_data(desc);
+=09unsigned long status, base, virq, idx, pos =3D 0;
+
+=09chained_irq_enter(chip, desc);
+=09spin_lock(&pcie->used_msi_lock);
+
+=09while ((pos =3D find_next_bit(pcie->used_msi, MSI_MAX, pos)) < MSI_MAX)=
{
+=09=09base =3D round_down(pos, 32);
+=09=09status =3D readl_relaxed(pcie->msi_status + base / 8);
+=09=09for_each_set_bit(idx, &status, 32) {
+=09=09=09virq =3D irq_find_mapping(pcie->irq_dom, base + idx);
+=09=09=09generic_handle_irq(virq);
+=09=09}
+=09=09pos =3D base + 32;
+=09}
+
+=09spin_unlock(&pcie->used_msi_lock);
+=09chained_irq_exit(chip, desc);
+}
+
+static void tango_ack(struct irq_data *d)
+{
+=09struct tango_pcie *pcie =3D d->chip_data;
+=09u32 offset =3D (d->hwirq / 32) * 4;
+=09u32 bit =3D BIT(d->hwirq % 32);
+
+=09writel_relaxed(bit, pcie->msi_status + offset);
+}
+
+static void update_msi_enable(struct irq_data *d, bool unmask)
+{
+=09unsigned long flags;
+=09struct tango_pcie *pcie =3D d->chip_data;
+=09u32 offset =3D (d->hwirq / 32) * 4;
+=09u32 bit =3D BIT(d->hwirq % 32);
+=09u32 val;
+
+=09spin_lock_irqsave(&pcie->used_msi_lock, flags);
+=09val =3D readl_relaxed(pcie->msi_enable + offset);
+=09val =3D unmask ? val | bit : val & ~bit;
+=09writel_relaxed(val, pcie->msi_enable + offset);
+=09spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+}
+
+static void tango_mask(struct irq_data *d)
+{
+=09update_msi_enable(d, false);
+}
+
+static void tango_unmask(struct irq_data *d)
+{
+=09update_msi_enable(d, true);
+}
+
+static int tango_set_affinity(struct irq_data *d,
+=09=09const struct cpumask *mask, bool force)
+{
+=09return -EINVAL;
+}
+
+static void tango_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)
+{
+=09struct tango_pcie *pcie =3D d->chip_data;
+=09msg->address_lo =3D lower_32_bits(pcie->msi_doorbell);
+=09msg->address_hi =3D upper_32_bits(pcie->msi_doorbell);
+=09msg->data =3D d->hwirq;
+}
+
+static struct irq_chip tango_chip =3D {
+=09.irq_ack=09=09=3D tango_ack,
+=09.irq_mask=09=09=3D tango_mask,
+=09.irq_unmask=09=09=3D tango_unmask,
+=09.irq_set_affinity=09=3D tango_set_affinity,
+=09.irq_compose_msi_msg=09=3D tango_compose_msi_msg,
+};
+
+static void msi_ack(struct irq_data *d)
+{
+=09irq_chip_ack_parent(d);
+}
+
+static void msi_mask(struct irq_data *d)
+{
+=09pci_msi_mask_irq(d);
+=09irq_chip_mask_parent(d);
+}
+
+static void msi_unmask(struct irq_data *d)
+{
+=09pci_msi_unmask_irq(d);
+=09irq_chip_unmask_parent(d);
+}
+
+static struct irq_chip msi_chip =3D {
+=09.name =3D "MSI",
+=09.irq_ack =3D msi_ack,
+=09.irq_mask =3D msi_mask,
+=09.irq_unmask =3D msi_unmask,
+};
+
+static struct msi_domain_info msi_dom_info =3D {
+=09.flags=09=3D MSI_FLAG_PCI_MSIX
+=09=09| MSI_FLAG_USE_DEF_DOM_OPS
+=09=09| MSI_FLAG_USE_DEF_CHIP_OPS,
+=09.chip=09=3D &msi_chip,
+};
+
+static int tango_irq_domain_alloc(struct irq_domain *dom,
+=09=09unsigned int virq, unsigned int nr_irqs, void *args)
+{
+=09unsigned long flags;
+=09int pos, err =3D -ENOSPC;
+=09struct tango_pcie *pcie =3D dom->host_data;
+
+=09spin_lock_irqsave(&pcie->used_msi_lock, flags);
+=09pos =3D find_first_zero_bit(pcie->used_msi, MSI_MAX);
+=09if (pos < MSI_MAX) {
+=09=09err =3D 0;
+=09=09__set_bit(pos, pcie->used_msi);
+=09=09irq_domain_set_info(dom, virq, pos,
+=09=09=09=09&tango_chip, pcie, handle_edge_irq, NULL, NULL);
+=09}
+=09spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+
+=09return err;
+}
+
+static void tango_irq_domain_free(struct irq_domain *dom,
+=09=09unsigned int virq, unsigned int nr_irqs)
+{
+=09unsigned long flags;
+=09struct irq_data *d =3D irq_domain_get_irq_data(dom, virq);
+=09struct tango_pcie *pcie =3D d->chip_data;
+
+=09spin_lock_irqsave(&pcie->used_msi_lock, flags);
+=09__clear_bit(d->hwirq, pcie->used_msi);
+=09spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+}
+
+static const struct irq_domain_ops irq_dom_ops =3D {
+=09.alloc=09=3D tango_irq_domain_alloc,
+=09.free=09=3D tango_irq_domain_free,
+};
+
+static int tango_msi_remove(struct platform_device *pdev)
+{
+=09struct tango_pcie *pcie =3D platform_get_drvdata(pdev);
+
+=09irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
+=09irq_domain_remove(pcie->msi_dom);
+=09irq_domain_remove(pcie->irq_dom);
+
+=09return 0;
+}
+
+static int tango_msi_probe(struct platform_device *pdev, struct tango_pcie=
*pcie)
+{
+=09int i, virq;
+=09struct irq_domain *msi_dom, *irq_dom;
+=09struct fwnode_handle *fwnode =3D of_node_to_fwnode(pdev->dev.of_node);
+
+=09spin_lock_init(&pcie->used_msi_lock);
+=09for (i =3D 0; i < MSI_MAX / 32; ++i)
+=09=09writel_relaxed(0, pcie->msi_enable + i * 4);
+
+=09virq =3D platform_get_irq(pdev, 1);
+=09if (virq <=3D 0) {
+=09=09pr_err("Failed to map IRQ\n");
+=09=09return -ENXIO;
+=09}
+
+=09irq_dom =3D irq_domain_create_linear(fwnode, MSI_MAX, &irq_dom_ops, pci=
e);
+=09if (!irq_dom) {
+=09=09pr_err("Failed to create IRQ domain\n");
+=09=09return -ENOMEM;
+=09}
+
+=09msi_dom =3D pci_msi_create_irq_domain(fwnode, &msi_dom_info, irq_dom);
+=09if (!msi_dom) {
+=09=09pr_err("Failed to create MSI domain\n");
+=09=09irq_domain_remove(irq_dom);
+=09=09return -ENOMEM;
+=09}
+
+=09pcie->irq_dom =3D irq_dom;
+=09pcie->msi_dom =3D msi_dom;
+=09pcie->irq =3D virq;
+
+=09irq_set_chained_handler_and_data(virq, tango_msi_isr, pcie);
+
+=09return 0;
+}
+
/*** HOST BRIDGE SUPPORT ***/
=20
static int smp8759_config_read(struct pci_bus *bus,
@@ -88,6 +300,9 @@ static int tango_check_pcie_link(void __iomem *test_out)
static int smp8759_init(struct tango_pcie *pcie, void __iomem *base)
{
=09pcie->mux=09=09=3D base + SMP8759_MUX;
+=09pcie->msi_status=09=3D base + SMP8759_STATUS;
+=09pcie->msi_enable=09=3D base + SMP8759_ENABLE;
+=09pcie->msi_doorbell=09=3D SMP8759_DOORBELL;
=20
=09return tango_check_pcie_link(base + SMP8759_TEST_OUT);
}
@@ -121,11 +336,21 @@ static int tango_pcie_probe(struct platform_device *p=
dev)
=09if (ret)
=09=09return ret;
=20
+=09ret =3D tango_msi_probe(pdev, pcie);
+=09if (ret)
+=09=09return ret;
+
=09return pci_host_common_probe(pdev, &smp8759_ecam_ops);
}
=20
+static int tango_pcie_remove(struct platform_device *pdev)
+{
+=09return tango_msi_remove(pdev);
+}
+
static struct platform_driver tango_pcie_driver =3D {
=09.probe=09=3D tango_pcie_probe,
+=09.remove=09=3D tango_pcie_remove,
=09.driver=09=3D {
=09=09.name =3D KBUILD_MODNAME,
=09=09.of_match_table =3D tango_pcie_ids,
--=20
2.11.0
next prev parent reply other threads:[~2017-06-14 9:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 13:28 [PATCH v5 0/3] Tango PCIe controller support Marc Gonzalez
2017-05-31 13:30 ` [PATCH v5 1/3] PCI: Add DT binding for tango PCIe controller Marc Gonzalez
2017-06-07 21:29 ` Rob Herring
2017-06-07 22:34 ` Mason
2017-06-13 11:55 ` Marc Zyngier
2017-06-13 14:23 ` Rob Herring
2017-06-13 13:51 ` [PATCH v6 " Marc Gonzalez
2017-06-18 14:05 ` Rob Herring
2017-05-31 13:33 ` [PATCH v5 2/3] PCI: Add tango PCIe host bridge support Marc Gonzalez
2017-06-07 8:19 ` Marc Gonzalez
2017-06-19 14:50 ` Marc Gonzalez
2017-06-19 15:58 ` Marc Zyngier
2017-06-19 16:01 ` Marc Gonzalez
2017-06-19 16:16 ` Marc Zyngier
2017-06-20 8:29 ` Marc Gonzalez
2017-07-05 9:36 ` Ard Biesheuvel
2017-07-05 12:18 ` Marc Gonzalez
2017-05-31 13:35 ` [PATCH v5 3/3] PCI: Add tango MSI controller support Marc Gonzalez
2017-06-13 12:09 ` Marc Zyngier
2017-06-13 14:01 ` [PATCH v6 " Marc Gonzalez
2017-06-13 14:22 ` Marc Zyngier
2017-06-13 14:47 ` Marc Gonzalez
2017-06-13 16:53 ` Marc Zyngier
2017-06-14 9:00 ` Marc Gonzalez [this message]
2017-06-14 9:19 ` [PATCH v7 " Marc Gonzalez
2017-06-14 9:32 ` Marc Zyngier
2017-06-14 11:06 ` [PATCH v8 " Marc Gonzalez
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=08d84ce3-5345-dc69-bbc3-37372a3df22b@sigmadesigns.com \
--to=marc_gonzalez@sigmadesigns.com \
--cc=david.laight@aculab.com \
--cc=helgaas@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=lorenzo.pieralisi@arm.com \
--cc=marc.zyngier@arm.com \
--cc=robin.murphy@arm.com \
--cc=slash.tmp@free.fr \
--cc=tglx@linutronix.de \
/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