From: Michael Ellerman <michael@ellerman.id.au>
To: linux-pci@atrey.karlin.mff.cuni.cz
Cc: Greg Kroah-Hartman <greg@kroah.com>,
Kyle McMartin <kyle@parisc-linux.org>,
linuxppc-dev@ozlabs.org, Brice Goglin <brice@myri.com>,
shaohua.li@intel.com, "David S. Miller" <davem@davemloft.net>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: [RFC/PATCH 14/16] MPIC MSI backend
Date: Thu, 25 Jan 2007 19:34:16 +1100 [thread overview]
Message-ID: <20070125083417.69895DE3C5@ozlabs.org> (raw)
In-Reply-To: <1169714047.65693.647693675533.qpush@cradle>
MPIC MSI backend. Based on code from Segher, heavily hacked by me.
Renamed to mpic_htmsi, as it only deals with MSI over Hypertransport.
We properly discover the HT magic address by reading the config space.
Now we have an irq allocator we can support > 1 MSI, and we don't reuse
the LSI.
Tested, succesfully getting MSIs from the tg3 via HT/PCI-X on a JS21
running SLOF. Successive insmod/rmmods working too.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
drivers/pci/msi/Makefile | 1
drivers/pci/msi/mpic_htmsi.c | 190 +++++++++++++++++++++++++++++++++++++++++++
include/asm-powerpc/msi.h | 3
3 files changed, 194 insertions(+)
Index: msi/drivers/pci/msi/Makefile
===================================================================
--- msi.orig/drivers/pci/msi/Makefile
+++ msi/drivers/pci/msi/Makefile
@@ -4,6 +4,7 @@
obj-y += core.o raw.o
obj-$(CONFIG_PPC_RTAS) += rtas.o
+obj-$(CONFIG_MPIC) += mpic_htmsi.o
ifeq ($(CONFIG_PCI_MSI_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
Index: msi/drivers/pci/msi/mpic_htmsi.c
===================================================================
--- /dev/null
+++ msi/drivers/pci/msi/mpic_htmsi.c
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2006, Segher Boessenkool, IBM Corporation.
+ * Copyright 2006-2007, Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the
+ * License.
+ *
+ */
+
+#include <linux/irq.h>
+#include <linux/bootmem.h>
+#include <linux/msi-ops.h>
+#include <asm/msi.h>
+#include <asm/mpic.h>
+#include <asm/prom.h>
+#include <asm/hw_irq.h>
+#include <asm/ppc-pci.h>
+
+/* XXX Do we ever need > 1 of these? void * msi_ops.data perhaps ? */
+static struct mpic *msi_mpic;
+
+static unsigned int find_ht_msi_capability(struct pci_dev *pdev)
+{
+ unsigned int pos = pci_find_capability(pdev, PCI_CAP_ID_HT);
+ u8 subcap, ttl = 48;
+
+ while (pos && ttl--) {
+ pci_read_config_byte(pdev, pos + 3, &subcap);
+ if ((subcap & 0xF8) == HT_CAPTYPE_MSI_MAPPING)
+ return pos;
+ pos = pci_find_next_capability(pdev, pos, PCI_CAP_ID_HT);
+ }
+
+ return 0;
+}
+
+static u64 read_ht_magic_addr(struct pci_dev *pdev, unsigned int pos)
+{
+ u8 flags;
+ u32 tmp;
+ u64 addr;
+
+ pci_read_config_byte(pdev, pos + HT_MSI_FLAGS, &flags);
+
+ if (flags & HT_MSI_FLAGS_FIXED)
+ return HT_MSI_FIXED_ADDR;
+
+ pci_read_config_dword(pdev, pos + HT_MSI_ADDR_LO, &tmp);
+ addr = tmp & HT_MSI_ADDR_LO_MASK;
+ pci_read_config_dword(pdev, pos + HT_MSI_ADDR_HI, &tmp);
+ addr = addr | ((u64)tmp << 32);
+
+ return addr;
+}
+
+static u64 find_ht_magic_addr(struct pci_dev *pdev)
+{
+ struct pci_bus *bus;
+ unsigned int pos;
+
+ for (bus = pdev->bus; bus; bus = bus->parent) {
+ pos = find_ht_msi_capability(bus->self);
+ if (pos)
+ return read_ht_magic_addr(bus->self, pos);
+ }
+
+ return 0;
+}
+
+static int htmsi_check(struct pci_dev *pdev, int num,
+ struct msix_entry *entries, int type)
+{
+ if (type == PCI_CAP_ID_MSIX) {
+ msi_debug("MSI-X unsupported for %s\n", pci_name(pdev));
+ return 1;
+ }
+
+ /* If we can't find a magic address then MSI ain't gonna work */
+ if (find_ht_magic_addr(pdev) == 0) {
+ msi_debug("no magic address found for %s\n", pci_name(pdev));
+ return 1;
+ }
+
+ return 0;
+}
+
+static void htmsi_free(struct pci_dev *pdev, int num,
+ struct msix_entry *entries, int type)
+{
+ irq_hw_number_t hwirq;
+ int i;
+
+ hwirq = irq_map[entries[0].vector].hwirq;
+
+ for (i = 0; i < num; i++) {
+ irq_dispose_mapping(entries[i].vector);
+ entries[i].vector = NO_IRQ;
+ }
+
+ msi_debug("freeing %d hwirqs for msi at offset 0x%lx\n", num, hwirq);
+ mpic_msi_free_hwirqs(msi_mpic, hwirq, num);
+
+ return;
+}
+
+static int htmsi_alloc(struct pci_dev *pdev, int num,
+ struct msix_entry *entries, int type)
+{
+ int i;
+ irq_hw_number_t hwirq;
+ unsigned int virq;
+
+ hwirq = mpic_msi_alloc_hwirqs(msi_mpic, num);
+ if (hwirq < 0) {
+ msi_debug("failed allocating %d hwirqs for %s\n", num,
+ pci_name(pdev));
+ return -1;
+ }
+
+ for (i = 0; i < num; i++) {
+ virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
+ if (virq == NO_IRQ) {
+ msi_debug("failed mapping hwirq 0x%lx for %s\n", hwirq,
+ pci_name(pdev));
+ goto out_free;
+ }
+
+ /* FIXME should we save the existing type */
+ set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
+
+ entries[i].vector = virq;
+ hwirq++;
+ }
+
+ return 0;
+
+ out_free:
+ htmsi_free(pdev, num, entries, type);
+ return -1;
+}
+
+static int htmsi_setup_msi_msg(struct pci_dev *pdev,
+ struct msix_entry *entry, struct msi_msg *msg, int type)
+{
+ u64 addr;
+
+ addr = find_ht_magic_addr(pdev);
+ msg->address_lo = addr & 0xFFFFFFFF;
+ msg->address_hi = addr >> 32;
+ msg->data = irq_map[entry->vector].hwirq;
+
+ msi_debug("allocated irq %d at 0x%lx for %s\n", entry->vector,
+ addr, pci_name(pdev));
+
+ return 0;
+}
+
+static struct msi_ops mpic_htmsi_ops = {
+ .check = htmsi_check,
+ .alloc = htmsi_alloc,
+ .free = htmsi_free,
+ .enable = msi_raw_enable,
+ .disable = msi_raw_disable,
+ .setup_msi_msg = htmsi_setup_msi_msg,
+};
+
+static struct msi_ops *htmsi_get_msi_ops(struct pci_dev *pdev)
+{
+ return &mpic_htmsi_ops;
+}
+
+int mpic_htmsi_init(struct mpic *mpic)
+{
+ int rc;
+
+ rc = mpic_msi_init_allocator(mpic);
+ if (rc) {
+ pr_debug("mpic_htmsi_init: Error allocating bitmap!\n");
+ return rc;
+ }
+
+ msi_mpic = mpic;
+
+ pr_debug("mpic_htmsi_init: Registering MPIC MSI ops.\n");
+ ppc_md.get_msi_ops = htmsi_get_msi_ops;
+
+ return 0;
+}
Index: msi/include/asm-powerpc/msi.h
===================================================================
--- msi.orig/include/asm-powerpc/msi.h
+++ msi/include/asm-powerpc/msi.h
@@ -20,10 +20,13 @@ static inline struct msi_ops *arch_get_m
return NULL;
}
+struct mpic;
#ifdef CONFIG_PCI_MSI
+extern int mpic_htmsi_init(struct mpic *mpic);
extern int msi_rtas_init(void);
#else
static inline int msi_rtas_init(void) { return -1; };
+static inline int mpic_htmsi_init(struct mpic *mpic) { return -1; }
#endif
#endif /* __ASM_POWERPC_MSI_H */
next prev parent reply other threads:[~2007-01-25 8:34 UTC|newest]
Thread overview: 178+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-25 8:34 [RFC/PATCH 0/16] Ops based MSI Implementation Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 1/16] Replace pci_msi_quirk with calls to pci_no_msi() Michael Ellerman
2007-01-25 22:33 ` patch msi-replace-pci_msi_quirk-with-calls-to-pci_no_msi.patch added to gregkh-2.6 tree gregkh
2007-01-25 8:34 ` [RFC/PATCH 2/16] Remove pci_scan_msi_device() Michael Ellerman
2007-01-25 22:33 ` patch msi-remove-pci_scan_msi_device.patch added to gregkh-2.6 tree gregkh
2007-01-25 8:34 ` [RFC/PATCH 3/16] Combine pci_(save|restore)_msi/msix_state Michael Ellerman
2007-01-25 22:33 ` patch msi-combine-pci__msi-msix_state.patch added to gregkh-2.6 tree gregkh
2007-01-25 8:34 ` [RFC/PATCH 4/16] Abstract MSI suspend Michael Ellerman
2007-01-25 22:33 ` patch msi-abstract-msi-suspend.patch added to gregkh-2.6 tree gregkh
2007-01-28 8:27 ` [RFC/PATCH 4/16] Abstract MSI suspend Eric W. Biederman
2007-01-29 7:22 ` Michael Ellerman
2007-01-29 8:45 ` Eric W. Biederman
2007-01-29 9:47 ` Michael Ellerman
2007-01-29 16:52 ` Grant Grundler
2007-01-29 16:57 ` Roland Dreier
2007-01-29 17:02 ` Roland Dreier
2007-01-29 17:25 ` Eric W. Biederman
2007-01-29 17:32 ` Roland Dreier
2007-01-29 22:03 ` Grant Grundler
2007-01-29 17:20 ` Eric W. Biederman
2007-02-01 4:24 ` Greg KH
2007-01-25 8:34 ` [RFC/PATCH 5/16] Ops based MSI implementation Michael Ellerman
2007-01-25 21:52 ` Greg KH
2007-01-25 22:05 ` Roland Dreier
2007-01-25 22:10 ` Greg KH
2007-01-26 1:02 ` Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 6/16] Add bare metal MSI enable & disable routines Michael Ellerman
2007-01-26 5:35 ` Eric W. Biederman
2007-01-25 8:34 ` [RFC/PATCH 7/16] Rip out the existing powerpc msi stubs Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 8/16] Enable MSI on Powerpc Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 9/16] RTAS MSI implementation Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 10/16] Add a pci_irq_fixup for MSI via RTAS Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 12/16] Tell firmware we support MSI Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 11/16] Activate MSI via RTAS on pseries Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 13/16] MPIC MSI allocator Michael Ellerman
2007-01-25 8:34 ` Michael Ellerman [this message]
2007-01-26 6:43 ` [RFC/PATCH 14/16] MPIC MSI backend Grant Grundler
2007-01-26 7:02 ` Eric W. Biederman
2007-01-26 8:47 ` Segher Boessenkool
2007-01-26 16:32 ` Eric W. Biederman
2007-01-26 17:19 ` Grant Grundler
2007-01-26 17:56 ` Eric W. Biederman
2007-01-26 22:48 ` Benjamin Herrenschmidt
2007-01-27 7:01 ` Michael Ellerman
2007-01-26 22:40 ` Benjamin Herrenschmidt
2007-01-27 2:11 ` David Miller
2007-01-26 22:08 ` Benjamin Herrenschmidt
2007-01-27 6:54 ` Michael Ellerman
2007-01-26 20:50 ` Benjamin Herrenschmidt
2007-01-26 22:46 ` Paul Mackerras
2007-01-27 2:46 ` Eric W. Biederman
2007-01-27 3:02 ` David Miller
2007-01-27 4:28 ` Eric W. Biederman
2007-01-27 18:30 ` Grant Grundler
2007-01-27 20:02 ` Benjamin Herrenschmidt
2007-01-26 20:41 ` Benjamin Herrenschmidt
2007-01-26 9:11 ` Segher Boessenkool
2007-01-27 6:33 ` Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 15/16] Enable MSI mappings for MPIC Michael Ellerman
2007-01-25 8:34 ` [RFC/PATCH 16/16] Activate MSI for the MPIC backend on U3 Michael Ellerman
2007-01-25 21:53 ` [RFC/PATCH 0/16] Ops based MSI Implementation Greg KH
2007-01-25 21:55 ` David Miller
2007-01-26 1:05 ` Michael Ellerman
2007-01-26 1:03 ` Michael Ellerman
2007-01-26 6:18 ` Eric W. Biederman
2007-01-26 6:56 ` Grant Grundler
2007-01-26 7:15 ` Eric W. Biederman
2007-01-26 7:48 ` Grant Grundler
2007-01-26 15:26 ` Eric W. Biederman
2007-01-26 21:58 ` Benjamin Herrenschmidt
2007-01-26 8:57 ` Segher Boessenkool
2007-01-26 17:27 ` Grant Grundler
2007-01-26 20:57 ` Benjamin Herrenschmidt
2007-01-26 21:24 ` Benjamin Herrenschmidt
2007-01-27 5:41 ` Michael Ellerman
2007-01-28 6:16 ` Eric W. Biederman
2007-01-28 8:12 ` Michael Ellerman
2007-01-28 8:36 ` Eric W. Biederman
2007-01-28 20:14 ` Benjamin Herrenschmidt
2007-01-28 20:53 ` Eric W. Biederman
2007-01-28 21:17 ` Benjamin Herrenschmidt
2007-01-28 22:36 ` Eric W. Biederman
2007-01-28 23:17 ` Benjamin Herrenschmidt
2007-01-28 23:38 ` Eric W. Biederman
2007-01-28 23:51 ` David Miller
2007-01-29 0:58 ` Benjamin Herrenschmidt
2007-01-29 1:13 ` David Miller
2007-01-29 3:17 ` Benjamin Herrenschmidt
2007-01-29 4:19 ` David Miller
2007-01-29 4:44 ` Benjamin Herrenschmidt
2007-01-29 5:46 ` Eric W. Biederman
2007-01-29 6:08 ` Benjamin Herrenschmidt
2007-01-31 6:52 ` David Miller
2007-01-31 7:40 ` Eric W. Biederman
2007-02-01 0:55 ` David Miller
2007-01-29 0:26 ` Benjamin Herrenschmidt
2007-01-29 0:59 ` Michael Ellerman
2007-01-28 23:31 ` David Miller
2007-01-28 23:59 ` Benjamin Herrenschmidt
2007-01-28 23:26 ` David Miller
2007-01-28 23:25 ` David Miller
2007-01-27 4:59 ` Michael Ellerman
2007-01-28 19:40 ` [PATCH 0/6] MSI portability cleanups Eric W. Biederman
2007-01-28 19:40 ` Eric W. Biederman
2007-01-28 19:42 ` [PATCH 1/6] msi: Kill msi_lookup_irq Eric W. Biederman
2007-01-28 19:42 ` Eric W. Biederman
2007-01-28 19:44 ` [PATCH 2/6] msi: Remove msi_lock Eric W. Biederman
2007-01-28 19:44 ` Eric W. Biederman
2007-01-28 19:45 ` [PATCH 3/6] msi: Fix msi_remove_pci_irq_vectors Eric W. Biederman
2007-01-28 19:45 ` Eric W. Biederman
2007-01-28 19:47 ` [PATCH 4/6] msi: Remove attach_msi_entry Eric W. Biederman
2007-01-28 19:47 ` Eric W. Biederman
2007-01-28 19:52 ` [PATCH 5/6] msi: Kill the msi_desc array Eric W. Biederman
2007-01-28 19:52 ` Eric W. Biederman
2007-01-28 19:56 ` [PATCH 6/6] msi: Make MSI useable more architectures Eric W. Biederman
2007-01-28 19:56 ` Eric W. Biederman
2007-02-01 6:08 ` patch msi-make-msi-useable-more-architectures.patch added to gregkh-2.6 tree gregkh
2007-02-01 6:07 ` patch msi-kill-the-msi_desc-array.patch " gregkh
2007-02-01 6:08 ` patch msi-remove-attach_msi_entry.patch " gregkh
2007-02-01 6:07 ` patch msi-fix-msi_remove_pci_irq_vectors.patch " gregkh
2007-02-01 6:08 ` patch msi-remove-msi_lock.patch " gregkh
2007-01-28 22:01 ` [PATCH 1/6] msi: Kill msi_lookup_irq Paul Mackerras
2007-01-28 22:01 ` Paul Mackerras
2007-01-28 22:18 ` Eric W. Biederman
2007-01-28 22:18 ` Eric W. Biederman
2007-02-01 6:07 ` patch msi-kill-msi_lookup_irq.patch added to gregkh-2.6 tree gregkh
2007-01-28 20:23 ` [PATCH 0/6] MSI portability cleanups Benjamin Herrenschmidt
2007-01-28 20:23 ` Benjamin Herrenschmidt
2007-01-28 20:47 ` Jeff Garzik
2007-01-28 20:47 ` Jeff Garzik
2007-01-28 21:20 ` Eric W. Biederman
2007-01-28 21:20 ` Eric W. Biederman
2007-01-28 21:26 ` Ingo Molnar
2007-01-28 21:26 ` Ingo Molnar
2007-01-28 22:09 ` Benjamin Herrenschmidt
2007-01-28 22:09 ` Benjamin Herrenschmidt
2007-01-28 23:26 ` Eric W. Biederman
2007-01-28 23:26 ` Eric W. Biederman
2007-01-28 23:37 ` David Miller
2007-01-28 23:37 ` David Miller
2007-01-29 5:18 ` Eric W. Biederman
2007-01-29 5:18 ` Eric W. Biederman
2007-01-29 5:25 ` David Miller
2007-01-29 5:25 ` David Miller
2007-01-29 5:58 ` Eric W. Biederman
2007-01-29 5:58 ` Eric W. Biederman
2007-01-29 6:05 ` Benjamin Herrenschmidt
2007-01-29 6:05 ` Benjamin Herrenschmidt
2007-01-29 8:28 ` Eric W. Biederman
2007-01-29 8:28 ` Eric W. Biederman
2007-01-29 9:03 ` Eric W. Biederman
2007-01-29 9:03 ` Eric W. Biederman
2007-01-29 10:11 ` Michael Ellerman
2007-01-29 10:11 ` Michael Ellerman
2007-01-29 20:32 ` Benjamin Herrenschmidt
2007-01-29 20:32 ` Benjamin Herrenschmidt
2007-01-29 23:29 ` Paul Mackerras
2007-01-29 23:29 ` Paul Mackerras
2007-01-29 23:40 ` Benjamin Herrenschmidt
2007-01-29 23:40 ` Benjamin Herrenschmidt
2007-01-29 20:22 ` Benjamin Herrenschmidt
2007-01-29 20:22 ` Benjamin Herrenschmidt
2007-01-29 23:05 ` Paul Mackerras
2007-01-29 23:05 ` Paul Mackerras
2007-01-30 19:32 ` Segher Boessenkool
2007-01-30 19:32 ` Segher Boessenkool
2007-01-29 1:33 ` Benjamin Herrenschmidt
2007-01-29 1:33 ` Benjamin Herrenschmidt
2007-02-01 4:29 ` Greg KH
2007-02-01 4:29 ` Greg KH
2007-01-28 23:44 ` David Miller
2007-01-28 23:44 ` David Miller
2007-01-28 22:11 ` Eric W. Biederman
2007-01-28 22:11 ` Eric W. Biederman
2007-01-28 23:42 ` David Miller
2007-01-28 23:42 ` David Miller
2007-01-28 21:34 ` Eric W. Biederman
2007-01-28 21:34 ` Eric W. Biederman
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=20070125083417.69895DE3C5@ozlabs.org \
--to=michael@ellerman.id.au \
--cc=brice@myri.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=greg@kroah.com \
--cc=kyle@parisc-linux.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=linuxppc-dev@ozlabs.org \
--cc=shaohua.li@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.