MSI support for Marvell EBU PCIe driver

Now that we have weak versions for each of the PCI MSI architecture functions, we can actually build the MSI support for all platforms, regardless of whether they provide or not architecture-specific versions of those functions. For this reason, the ARCH_SUPPORTS_MSI hidden kconfig boolean becomes useless, and this patch gets rid of it.

Signed-off-by Thomas Petazzoni <[email protected]>

Cc Benjamin Herrenschmidt <[email protected]>

Cc Paul Mackerras <[email protected]>

Cc linuxppc-dev at lists.ozlabs.org

Cc Martin Schwidefsky <[email protected]>

Cc Heiko Carstens <[email protected]>

Cc linux390 at de.ibm.com

Cc linux-s390 at vger.kernel.org

Cc Thomas Gleixner <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc H. Peter Anvin <[email protected]>

Cc x86 at kernel.org

Cc Russell King <[email protected]>

Cc Tony Luck <[email protected]>

Cc Fenghua Yu <[email protected]>

Cc linux-ia64 at vger.kernel.org

Cc Ralf Baechle <[email protected]>

Cc linux-mips at linux-mips.org

Cc David S. Miller <[email protected]>

Cc sparclinux at vger.kernel.org

Cc Chris Metcalf <[email protected]>

---
 arch/arm/Kconfig     | 1 -
 arch/ia64/Kconfig    | 1 -
 arch/mips/Kconfig    | 2 --
 arch/powerpc/Kconfig | 1 -
 arch/s390/Kconfig    | 1 -
 arch/sparc/Kconfig   | 1 -
 arch/tile/Kconfig    | 1 -
 arch/x86/Kconfig     | 1 -
 drivers/pci/Kconfig  | 4 ----
 9 files changed, 13 deletions(-)

arch/arm/Kconfig +0 -1

index 37c0f4e..41b6c96 100644
@@ -441,7 +441,6 @@ config ARCH_NETX
 config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
-       select ARCH_SUPPORTS_MSI
        select CPU_XSC3
        select NEED_MACH_MEMORY_H
        select NEED_RET_TO_USER

arch/ia64/Kconfig +0 -1

index 5a768ad..098602b 100644
@@ -9,7 +9,6 @@ config IA64
        select PCI if (!IA64_HP_SIM)
        select ACPI if (!IA64_HP_SIM)
        select PM if (!IA64_HP_SIM)
-       select ARCH_SUPPORTS_MSI
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE

arch/mips/Kconfig +0 -2

index c3abed3..01b5f5a 100644
@@ -726,7 +726,6 @@ config CAVIUM_OCTEON_SOC
        select SYS_HAS_CPU_CAVIUM_OCTEON
        select SWAP_IO_SPACE
        select HW_HAS_PCI
-       select ARCH_SUPPORTS_MSI
        select ZONE_DMA32
        select USB_ARCH_HAS_OHCI
        select USB_ARCH_HAS_EHCI

@@ -762,7 +761,6 @@ config NLM_XLR_BOARD
        select CEVT_R4K
        select CSRC_R4K
        select IRQ_CPU
-       select ARCH_SUPPORTS_MSI
        select ZONE_DMA32 if 64BIT
        select SYNC_R4K
        select SYS_HAS_EARLY_PRINTK

arch/powerpc/Kconfig +0 -1

index 3bf72cd..183a165 100644
@@ -727,7 +727,6 @@ config PCI
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
-       select ARCH_SUPPORTS_MSI
        select GENERIC_PCI_IOMAP
        help
          Find out whether your system includes a PCI bus. PCI is the name of

arch/s390/Kconfig +0 -1

index 22f75b5..e9982a3 100644
@@ -428,7 +428,6 @@ menuconfig PCI
        bool "PCI support"
        default n
        depends on 64BIT
-       select ARCH_SUPPORTS_MSI
        select PCI_MSI
        help
          Enable PCI support.

arch/sparc/Kconfig +0 -1

index a00cbd3..1570ad2 100644
@@ -52,7 +52,6 @@ config SPARC32
 
 config SPARC64
        def_bool 64BIT
-       select ARCH_SUPPORTS_MSI
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_GRAPH_FP_TEST

arch/tile/Kconfig +0 -1

index 24565a7..74dff90 100644
@@ -380,7 +380,6 @@ config PCI
        select PCI_DOMAINS
        select GENERIC_PCI_IOMAP
        select TILE_GXIO_TRIO if TILEGX
-       select ARCH_SUPPORTS_MSI if TILEGX
        select PCI_MSI if TILEGX
        ---help---
          Enable PCI root complex support, so PCIe endpoint devices can

arch/x86/Kconfig +0 -1

index b32ebf9..5db62ef 100644
@@ -2014,7 +2014,6 @@ menu "Bus options (PCI etc.)"
 config PCI
        bool "PCI support"
        default y
-       select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
        ---help---
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside

drivers/pci/Kconfig +0 -5

index 81944fb..b6a99f7 100644
@@ -1,13 +1,9 @@
 #
 # PCI configuration
 #
-config ARCH_SUPPORTS_MSI
-       bool
-
 config PCI_MSI
        bool "Message Signaled Interrupts (MSI and MSI-X)"
        depends on PCI
-       depends on ARCH_SUPPORTS_MSI
        help
           This allows device drivers to enable MSI (Message Signaled
           Interrupts).  Message Signaled Interrupts enable a device to
--

1.8.1.2

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

Quoted 12 lines · Thomas Petazzoni

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

Quoted 2 lines

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

Recall that Grant gave up most/all of his maintainerships, so you probably want someone else to approve patches 5/6/7. It looks like Benjamin Herrenschmidt <[email protected]> is listed in MAINTAINERS for those patches.

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

Quoted 12 lines · Thomas Petazzoni

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

Quoted 2 lines

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

I just acked 2, and my ack is already on 12. Let me know if you need anything else from me.

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

The patches do the following:

* Patch 1 reworks how the architecture-specific MSI functions can be overriden by architecture-specific code, by using weak functions. It was suggested by Bjorn Helgaas.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 2 removes the ARCH_SUPPORTS_MSI hidden kconfig boolean which is no longer needed now that we have weak functions for all MSI architecture-specific hooks.

This patch needs the Ack from Bjorn Helgaas, and the relevant architecture maintainers.

* Patch 3 adds a minimal msi_chip infrastructure, that allows a pci_bus to be connected to a msi_chip, and that provides default implementations of the architecture-specific MSI functions to use msi_chip.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 4 adds an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself.

Patch has been Acked by Grant Likely, irq_domain maintainer.

* Patch 5 refactors the __irq_domain_add() function in the irq_domain code, in preparation for the introduction of MSI support in irq_domain.

This patch needs the ACK of Grant Likely.

* Patch 6 allows to create an irq_domain associated with a msi_chip, thanks to the new irq_domain_add_msi() function.

This patch needs the ACK of Grant Likely.

* Patch 7 adds a new function irq_find_msi_host() to find the MSI-type interrupt controller associated to a given DT node, and adjusts irq_find_host() to not match MSI-type interrupt controllers.

This patch needs the ACK of Grant Likely.

* Patch 8 makes some not very interesting preparation in the Armada 370/XP IRQ controller driver.

This patch needs the Ack from Thomas Gleixner.

* Patch 9 implements the MSI support in the Armada 370/XP IRQ controller driver. It registers an msi_chip using the msi_chip_add() function added in PATCH 3.

This patch needs the Ack from Thomas Gleixner.

* Patch 10 extends the ARM PCI core to expose ->add_bus() and ->remove_bus() hooks to PCI drivers. This was suggested by Bjorn Helgaas to allow the PCI driver to connected the PCI busses with the corresponding MSI chip.

This patch has been Acked by Russell King, the ARM maintainer.

* Patch 11 adjust the Armada 370/XP Device Tree to indicate that the MPIC is not only an interrupt-controller, but also an msi-controller.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell maintainers.

* Patch 12 adds MSI support in the Marvell PCIe host controller driver. The work to do here is minimal: get a reference to the msi-parent controller thanks to msi_chip_find_by_of_node(), and link it to the pci_bus structure before the bus gets enumerated.

This patch needs the Ack from Bjorn Helgaas.

* Patch 13 adjusts the Armada 370/XP Device Tree to add the msi-parent properties in the PCIe controller nodes.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell Maintainers.

This version 6 follows:
* PATCH version 5 sent on July, 15th 2013
* PATCH version 4 sent on July, 1st 2013
* PATCH version 3 sent on June, 19th 2013
* PATCH version 2 sent on June, 6th 2013
* RFC version 1 sent on March, 26th 2013

Changes since v5:

* Rebased on top of 3.11-rc3.

* Implemented the suggestions of Grant Likely on "irqdomain: add irq_alloc_mapping() function" and added his Acked-by.

* Added Bjorn Helgaas Acked-by on "PCI: use weak functions for MSI arch-specific functions".

* Added Bjorn Helgaas Acked-by on "PCI: Introduce new MSI chip infrastructure".

* Remove the drivers/of global registry of irq_chip, and as suggested by Grant Likely, create an association between an irq_domain and a msi_chip. This required refactoring the __irq_domain_add() function, adding a 'msi_chip' pointer to 'irq_domain', adding an irq_domain_add_msi() function and a irq_find_msi_host() function.

* Added Russell King Acked-by on "ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci"

Changes since v4:

* Rebased on top of 3.11-rc1.

* Slightly rework the implementation of arch_setup_msi_irq(), arch_teardown_msi_irq and arch_msi_check_device() according to the suggestions of Bjorn Helgaas (PATCH 4)

* Make a few improvements to the msi_chip registry, according to the suggestion of Bjorn Helgaas and Rob Herring: coding style fixes, usage of mutex while traversing the list of msi_chip, usage of of_pci_msi_* prefix instead of just of_msi_*.

Changes since v3:

* Keep only a default_teardown_msi_irqs() function needed for the Xen PCI x86 code, and remove all other default_*() function and put the default behavior directly in the weak functions. Suggested by Thierry Redding and Bjorn Helgaas.

* Misc small improvements the MSI chip registry code: compiled only under CONFIG_PCI_MSI, functions exported to modules, addition of an of_msi_chip_remove() function, renaming of of_msi_chip_find_by_node() to of_find_msi_chip_by_node(), move the test of the "msi-controller" property to the of_msi_chip_add() function, renamed the list_head field from link to list, added dummy functions in the header files when !CONFIG_PCI_MSI && !CONFIG_OF. All suggested by Thierry Redding.

* Add a patch that entirely removes the ARCH_SUPPORTS_MSI, as we now have weak functions, so even if an arch doesn't actually use/support MSI, the code will build properly. Suggested by Thierry Redding.

* Added Device Tree binding documentation updates for the IRQ controller and the PCIe controller.

Changes since v2:

* Add an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself. (PATCH 1)

* Separate the use of weak functions from the introduction of the msi_chip infrastructure, and use weak functions for all architecture-specific MSI hooks. Suggested by Bjorn Helgaas (PATCH 2).

* Move the msi_chip registry to drivers/of. Suggested by Bjorn Helgaas (PATCH 4).

* Use pcibios_add_bus() and pcibios_remove_bus() to connect the PCI busses to their msi_chip, as suggested by Bjorn Helgaas. Requires some ARM PCI core changes (PATCH 7), and then changes to the PCI driver itself (PATCH 9).

This set of patches applies on top of 3.11-rc3, and is available as a Git branch at
https://github.com/MISL-EBU-System-SW/mainline-public/tree/marvell-pcie-msi-v6.

Thanks,

Thomas

Thierry Reding (1):
PCI: Introduce new MSI chip infrastructure

Thomas Petazzoni (12):
PCI: use weak functions for MSI arch-specific functions
PCI: remove ARCH_SUPPORTS_MSI kconfig option
irqdomain: add irq_alloc_mapping() function
irqdomain: refactor __irq_domain_add()
irqdomain: add support to associate an irq_domain with a msi_chip
irqdomain: add function to find a MSI irq_domain
irqchip: armada-370-xp: properly request resources
irqchip: armada-370-xp: implement MSI support
ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci
ARM: mvebu: the MPIC now provides MSI controller features
PCI: mvebu: add support for MSI
ARM: mvebu: link PCIe controllers to the MSI controller

 .../devicetree/bindings/arm/armada-370-xp-mpic.txt |   3 +
 .../devicetree/bindings/pci/mvebu-pci.txt          |   3 +
 arch/arm/Kconfig                                   |   1 -
 arch/arm/boot/dts/armada-370-xp.dtsi               |   1 +
 arch/arm/boot/dts/armada-370.dtsi                  |   1 +
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |   1 +
 arch/arm/include/asm/mach/pci.h                    |   4 +
 arch/arm/kernel/bios32.c                           |  16 +++
 arch/ia64/Kconfig                                  |   1 -
 arch/mips/Kconfig                                  |   2 -
 arch/mips/include/asm/pci.h                        |   5 -
 arch/powerpc/Kconfig                               |   1 -
 arch/powerpc/include/asm/pci.h                     |   5 -
 arch/s390/Kconfig                                  |   1 -
 arch/s390/include/asm/pci.h                        |   4 -
 arch/sparc/Kconfig                                 |   1 -
 arch/tile/Kconfig                                  |   1 -
 arch/x86/Kconfig                                   |   1 -
 arch/x86/include/asm/pci.h                         |  28 ----
 arch/x86/kernel/x86_init.c                         |  21 +++
 drivers/irqchip/irq-armada-370-xp.c                | 153 ++++++++++++++++++++-
 drivers/pci/Kconfig                                |   4 -
 drivers/pci/host/pci-mvebu.c                       |  31 +++++
 drivers/pci/msi.c                                  |  66 +++++----
 drivers/pci/probe.c                                |   1 +
 include/linux/irqdomain.h                          |  62 ++++++++-
 include/linux/msi.h                                |  18 ++-
 include/linux/pci.h                                |   1 +
 kernel/irq/irqdomain.c                             |  89 +++++++++---
 31 files changed, 422 insertions(+), 106 deletions(-)

Benjamin, Thomas,

This patch set has been around for two months now, and I would really like to see it merged. Your ACKs are the only ones missing to merge the whole thing.

Would you mind having a look at:

* Patches 4, 5, 6, 7 for Benjamin as the irqdomain maintainer.

* Patches 8 and 9 for Thomas as the drivers/irqchip maintainer.

Thanks a lot!

Thomas

Quoted 244 lines · Thomas Petazzoni

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

The patches do the following:

* Patch 1 reworks how the architecture-specific MSI functions can be overriden by architecture-specific code, by using weak functions. It was suggested by Bjorn Helgaas.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 2 removes the ARCH_SUPPORTS_MSI hidden kconfig boolean which is no longer needed now that we have weak functions for all MSI architecture-specific hooks.

This patch needs the Ack from Bjorn Helgaas, and the relevant architecture maintainers.

* Patch 3 adds a minimal msi_chip infrastructure, that allows a pci_bus to be connected to a msi_chip, and that provides default implementations of the architecture-specific MSI functions to use msi_chip.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 4 adds an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself.

Patch has been Acked by Grant Likely, irq_domain maintainer.

* Patch 5 refactors the __irq_domain_add() function in the irq_domain code, in preparation for the introduction of MSI support in irq_domain.

This patch needs the ACK of Grant Likely.

* Patch 6 allows to create an irq_domain associated with a msi_chip, thanks to the new irq_domain_add_msi() function.

This patch needs the ACK of Grant Likely.

* Patch 7 adds a new function irq_find_msi_host() to find the MSI-type interrupt controller associated to a given DT node, and adjusts irq_find_host() to not match MSI-type interrupt controllers.

This patch needs the ACK of Grant Likely.

* Patch 8 makes some not very interesting preparation in the Armada 370/XP IRQ controller driver.

This patch needs the Ack from Thomas Gleixner.

* Patch 9 implements the MSI support in the Armada 370/XP IRQ controller driver. It registers an msi_chip using the msi_chip_add() function added in PATCH 3.

This patch needs the Ack from Thomas Gleixner.

* Patch 10 extends the ARM PCI core to expose ->add_bus() and ->remove_bus() hooks to PCI drivers. This was suggested by Bjorn Helgaas to allow the PCI driver to connected the PCI busses with the corresponding MSI chip.

This patch has been Acked by Russell King, the ARM maintainer.

* Patch 11 adjust the Armada 370/XP Device Tree to indicate that the MPIC is not only an interrupt-controller, but also an msi-controller.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell maintainers.

* Patch 12 adds MSI support in the Marvell PCIe host controller driver. The work to do here is minimal: get a reference to the msi-parent controller thanks to msi_chip_find_by_of_node(), and link it to the pci_bus structure before the bus gets enumerated.

This patch needs the Ack from Bjorn Helgaas.

* Patch 13 adjusts the Armada 370/XP Device Tree to add the msi-parent properties in the PCIe controller nodes.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell Maintainers.

This version 6 follows:
* PATCH version 5 sent on July, 15th 2013
* PATCH version 4 sent on July, 1st 2013
* PATCH version 3 sent on June, 19th 2013
* PATCH version 2 sent on June, 6th 2013
* RFC version 1 sent on March, 26th 2013

Changes since v5:

* Rebased on top of 3.11-rc3.

* Implemented the suggestions of Grant Likely on "irqdomain: add irq_alloc_mapping() function" and added his Acked-by.

* Added Bjorn Helgaas Acked-by on "PCI: use weak functions for MSI arch-specific functions".

* Added Bjorn Helgaas Acked-by on "PCI: Introduce new MSI chip infrastructure".

* Remove the drivers/of global registry of irq_chip, and as suggested by Grant Likely, create an association between an irq_domain and a msi_chip. This required refactoring the __irq_domain_add() function, adding a 'msi_chip' pointer to 'irq_domain', adding an irq_domain_add_msi() function and a irq_find_msi_host() function.

* Added Russell King Acked-by on "ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci"

Changes since v4:

* Rebased on top of 3.11-rc1.

* Slightly rework the implementation of arch_setup_msi_irq(), arch_teardown_msi_irq and arch_msi_check_device() according to the suggestions of Bjorn Helgaas (PATCH 4)

* Make a few improvements to the msi_chip registry, according to the suggestion of Bjorn Helgaas and Rob Herring: coding style fixes, usage of mutex while traversing the list of msi_chip, usage of of_pci_msi_* prefix instead of just of_msi_*.

Changes since v3:

* Keep only a default_teardown_msi_irqs() function needed for the Xen PCI x86 code, and remove all other default_*() function and put the default behavior directly in the weak functions. Suggested by Thierry Redding and Bjorn Helgaas.

* Misc small improvements the MSI chip registry code: compiled only under CONFIG_PCI_MSI, functions exported to modules, addition of an of_msi_chip_remove() function, renaming of of_msi_chip_find_by_node() to of_find_msi_chip_by_node(), move the test of the "msi-controller" property to the of_msi_chip_add() function, renamed the list_head field from link to list, added dummy functions in the header files when !CONFIG_PCI_MSI && !CONFIG_OF. All suggested by Thierry Redding.

* Add a patch that entirely removes the ARCH_SUPPORTS_MSI, as we now have weak functions, so even if an arch doesn't actually use/support MSI, the code will build properly. Suggested by Thierry Redding.

* Added Device Tree binding documentation updates for the IRQ controller and the PCIe controller.

Changes since v2:

* Add an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself. (PATCH 1)

* Separate the use of weak functions from the introduction of the msi_chip infrastructure, and use weak functions for all architecture-specific MSI hooks. Suggested by Bjorn Helgaas (PATCH 2).

* Move the msi_chip registry to drivers/of. Suggested by Bjorn Helgaas (PATCH 4).

* Use pcibios_add_bus() and pcibios_remove_bus() to connect the PCI busses to their msi_chip, as suggested by Bjorn Helgaas. Requires some ARM PCI core changes (PATCH 7), and then changes to the PCI driver itself (PATCH 9).

This set of patches applies on top of 3.11-rc3, and is available as a Git branch at
https://github.com/MISL-EBU-System-SW/mainline-public/tree/marvell-pcie-msi-v6.

Thanks,

Thomas

Thierry Reding (1):
PCI: Introduce new MSI chip infrastructure

Thomas Petazzoni (12):
PCI: use weak functions for MSI arch-specific functions
PCI: remove ARCH_SUPPORTS_MSI kconfig option
irqdomain: add irq_alloc_mapping() function
irqdomain: refactor __irq_domain_add()
irqdomain: add support to associate an irq_domain with a msi_chip
irqdomain: add function to find a MSI irq_domain
irqchip: armada-370-xp: properly request resources
irqchip: armada-370-xp: implement MSI support
ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci
ARM: mvebu: the MPIC now provides MSI controller features
PCI: mvebu: add support for MSI
ARM: mvebu: link PCIe controllers to the MSI controller

 .../devicetree/bindings/arm/armada-370-xp-mpic.txt |   3 +
 .../devicetree/bindings/pci/mvebu-pci.txt          |   3 +
 arch/arm/Kconfig                                   |   1 -
 arch/arm/boot/dts/armada-370-xp.dtsi               |   1 +
 arch/arm/boot/dts/armada-370.dtsi                  |   1 +
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |   1 +
 arch/arm/include/asm/mach/pci.h                    |   4 +
 arch/arm/kernel/bios32.c                           |  16 +++
 arch/ia64/Kconfig                                  |   1 -
 arch/mips/Kconfig                                  |   2 -
 arch/mips/include/asm/pci.h                        |   5 -
 arch/powerpc/Kconfig                               |   1 -
 arch/powerpc/include/asm/pci.h                     |   5 -
 arch/s390/Kconfig                                  |   1 -
 arch/s390/include/asm/pci.h                        |   4 -
 arch/sparc/Kconfig                                 |   1 -
 arch/tile/Kconfig                                  |   1 -
 arch/x86/Kconfig                                   |   1 -
 arch/x86/include/asm/pci.h                         |  28 ----
 arch/x86/kernel/x86_init.c                         |  21 +++
 drivers/irqchip/irq-armada-370-xp.c                | 153 ++++++++++++++++++++-
 drivers/pci/Kconfig                                |   4 -
 drivers/pci/host/pci-mvebu.c                       |  31 +++++
 drivers/pci/msi.c                                  |  66 +++++----
 drivers/pci/probe.c                                |   1 +
 include/linux/irqdomain.h                          |  62 ++++++++-
 include/linux/msi.h                                |  18 ++-
 include/linux/pci.h                                |   1 +
 kernel/irq/irqdomain.c                             |  89 +++++++++---
 31 files changed, 422 insertions(+), 106 deletions(-)

Quoted 3 lines

Would you mind having a look at:

* Patches 4, 5, 6, 7 for Benjamin as the irqdomain maintainer.

Ah sorry, I wasn't aware you were actually waiting for my acks, I didn't read the whole thread, my bad. I'm not irqdomain maintainer btw.

I wrote the original powerpc implementation but since then it has been taken over by Grant and others. But I can certainly comment :-)

Quoted 6 lines · Thomas Petazzoni

Benjamin, Thomas,

This patch set has been around for two months now, and I would really like to see it merged. Your ACKs are the only ones missing to merge the whole thing.

Quoted 3 lines

Would you mind having a look at:

* Patches 4, 5, 6, 7 for Benjamin as the irqdomain maintainer.

Ah sorry, I wasn't aware you were actually waiting for my acks, I didn't read the whole thread, my bad. I'm not irqdomain maintainer btw. I wrote the original powerpc implementation but since then it has been taken over by Grant and others. But I can certainly comment :-)

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

Quoted 6 lines · Thomas Petazzoni

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

Thomas,

I tested this set of patches on a custom Marvell Armada XP 78260 based board. It was connected to another system over PCIe, through a non-transparent bridge; MSI support was required. We also tested a similar configuration using the Armada XP GP platform. The patch seems to work for us. Many thanks!

Tested-by Daniel Price <[email protected]>

Hello,

This set of patches introduces Message Signaled Interrupt support in the Marvell EBU PCIe driver. It has been successfully tested on the Armada XP GP platform with an Intel e1000e PCIe network card that supports MSI.

This patch set is intended for merging in 3.12, so the respective maintainers of the different areas are invited to review/ack the patches, see below for the details. Note that several of those patches are also needed for the Tegra PCIe driver.

There are still missing ACKs from Grant Likely (5, 6, 7), Thomas Gleixner (8, 9) and Bjorn Helgaas (2, 12).

The patches do the following:

* Patch 1 reworks how the architecture-specific MSI functions can be overriden by architecture-specific code, by using weak functions. It was suggested by Bjorn Helgaas.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 2 removes the ARCH_SUPPORTS_MSI hidden kconfig boolean which is no longer needed now that we have weak functions for all MSI architecture-specific hooks.

This patch needs the Ack from Bjorn Helgaas, and the relevant architecture maintainers.

* Patch 3 adds a minimal msi_chip infrastructure, that allows a pci_bus to be connected to a msi_chip, and that provides default implementations of the architecture-specific MSI functions to use msi_chip.

This patch has been acked by Bjorn Helgaas, the PCI maintainter.

* Patch 4 adds an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself.

Patch has been Acked by Grant Likely, irq_domain maintainer.

* Patch 5 refactors the __irq_domain_add() function in the irq_domain code, in preparation for the introduction of MSI support in irq_domain.

This patch needs the ACK of Grant Likely.

* Patch 6 allows to create an irq_domain associated with a msi_chip, thanks to the new irq_domain_add_msi() function.

This patch needs the ACK of Grant Likely.

* Patch 7 adds a new function irq_find_msi_host() to find the MSI-type interrupt controller associated to a given DT node, and adjusts irq_find_host() to not match MSI-type interrupt controllers.

This patch needs the ACK of Grant Likely.

* Patch 8 makes some not very interesting preparation in the Armada 370/XP IRQ controller driver.

This patch needs the Ack from Thomas Gleixner.

* Patch 9 implements the MSI support in the Armada 370/XP IRQ controller driver. It registers an msi_chip using the msi_chip_add() function added in PATCH 3.

This patch needs the Ack from Thomas Gleixner.

* Patch 10 extends the ARM PCI core to expose ->add_bus() and ->remove_bus() hooks to PCI drivers. This was suggested by Bjorn Helgaas to allow the PCI driver to connected the PCI busses with the corresponding MSI chip.

This patch has been Acked by Russell King, the ARM maintainer.

* Patch 11 adjust the Armada 370/XP Device Tree to indicate that the MPIC is not only an interrupt-controller, but also an msi-controller.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell maintainers.

* Patch 12 adds MSI support in the Marvell PCIe host controller driver. The work to do here is minimal: get a reference to the msi-parent controller thanks to msi_chip_find_by_of_node(), and link it to the pci_bus structure before the bus gets enumerated.

This patch needs the Ack from Bjorn Helgaas.

* Patch 13 adjusts the Armada 370/XP Device Tree to add the msi-parent properties in the PCIe controller nodes.

This patch needs the Ack from Jason Cooper, Gregory Clement and/or Andrew Lunn, the Marvell Maintainers.

This version 6 follows:
* PATCH version 5 sent on July, 15th 2013
* PATCH version 4 sent on July, 1st 2013
* PATCH version 3 sent on June, 19th 2013
* PATCH version 2 sent on June, 6th 2013
* RFC version 1 sent on March, 26th 2013

Changes since v5:

* Rebased on top of 3.11-rc3.

* Implemented the suggestions of Grant Likely on "irqdomain: add irq_alloc_mapping() function" and added his Acked-by.

* Added Bjorn Helgaas Acked-by on "PCI: use weak functions for MSI arch-specific functions".

* Added Bjorn Helgaas Acked-by on "PCI: Introduce new MSI chip infrastructure".

* Remove the drivers/of global registry of irq_chip, and as suggested by Grant Likely, create an association between an irq_domain and a msi_chip. This required refactoring the __irq_domain_add() function, adding a 'msi_chip' pointer to 'irq_domain', adding an irq_domain_add_msi() function and a irq_find_msi_host() function.

* Added Russell King Acked-by on "ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci"

Changes since v4:

* Rebased on top of 3.11-rc1.

* Slightly rework the implementation of arch_setup_msi_irq(), arch_teardown_msi_irq and arch_msi_check_device() according to the suggestions of Bjorn Helgaas (PATCH 4)

* Make a few improvements to the msi_chip registry, according to the suggestion of Bjorn Helgaas and Rob Herring: coding style fixes, usage of mutex while traversing the list of msi_chip, usage of of_pci_msi_* prefix instead of just of_msi_*.

Changes since v3:

* Keep only a default_teardown_msi_irqs() function needed for the Xen PCI x86 code, and remove all other default_*() function and put the default behavior directly in the weak functions. Suggested by Thierry Redding and Bjorn Helgaas.

* Misc small improvements the MSI chip registry code: compiled only under CONFIG_PCI_MSI, functions exported to modules, addition of an of_msi_chip_remove() function, renaming of of_msi_chip_find_by_node() to of_find_msi_chip_by_node(), move the test of the "msi-controller" property to the of_msi_chip_add() function, renamed the list_head field from link to list, added dummy functions in the header files when !CONFIG_PCI_MSI && !CONFIG_OF. All suggested by Thierry Redding.

* Add a patch that entirely removes the ARCH_SUPPORTS_MSI, as we now have weak functions, so even if an arch doesn't actually use/support MSI, the code will build properly. Suggested by Thierry Redding.

* Added Device Tree binding documentation updates for the IRQ controller and the PCIe controller.

Changes since v2:

* Add an IRQ domain function that allows to allocate dynamically a free hwirq number from an IRQ domain, and create a virq mapping to it. It was suggested by Grant Likely in order to remove the hwirq allocation code from the IRQ driver itself. (PATCH 1)

* Separate the use of weak functions from the introduction of the msi_chip infrastructure, and use weak functions for all architecture-specific MSI hooks. Suggested by Bjorn Helgaas (PATCH 2).

* Move the msi_chip registry to drivers/of. Suggested by Bjorn Helgaas (PATCH 4).

* Use pcibios_add_bus() and pcibios_remove_bus() to connect the PCI busses to their msi_chip, as suggested by Bjorn Helgaas. Requires some ARM PCI core changes (PATCH 7), and then changes to the PCI driver itself (PATCH 9).

This set of patches applies on top of 3.11-rc3, and is available as a Git branch at
https://github.com/MISL-EBU-System-SW/mainline-public/tree/marvell-pcie-msi-v6.

Thanks,

Thomas

Thierry Reding (1):
PCI: Introduce new MSI chip infrastructure

Thomas Petazzoni (12):
PCI: use weak functions for MSI arch-specific functions
PCI: remove ARCH_SUPPORTS_MSI kconfig option
irqdomain: add irq_alloc_mapping() function
irqdomain: refactor __irq_domain_add()
irqdomain: add support to associate an irq_domain with a msi_chip
irqdomain: add function to find a MSI irq_domain
irqchip: armada-370-xp: properly request resources
irqchip: armada-370-xp: implement MSI support
ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci
ARM: mvebu: the MPIC now provides MSI controller features
PCI: mvebu: add support for MSI
ARM: mvebu: link PCIe controllers to the MSI controller

 .../devicetree/bindings/arm/armada-370-xp-mpic.txt |   3 +
 .../devicetree/bindings/pci/mvebu-pci.txt          |   3 +
 arch/arm/Kconfig                                   |   1 -
 arch/arm/boot/dts/armada-370-xp.dtsi               |   1 +
 arch/arm/boot/dts/armada-370.dtsi                  |   1 +
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   1 +
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |   1 +
 arch/arm/include/asm/mach/pci.h                    |   4 +
 arch/arm/kernel/bios32.c                           |  16 +++
 arch/ia64/Kconfig                                  |   1 -
 arch/mips/Kconfig                                  |   2 -
 arch/mips/include/asm/pci.h                        |   5 -
 arch/powerpc/Kconfig                               |   1 -
 arch/powerpc/include/asm/pci.h                     |   5 -
 arch/s390/Kconfig                                  |   1 -
 arch/s390/include/asm/pci.h                        |   4 -
 arch/sparc/Kconfig                                 |   1 -
 arch/tile/Kconfig                                  |   1 -
 arch/x86/Kconfig                                   |   1 -
 arch/x86/include/asm/pci.h                         |  28 ----
 arch/x86/kernel/x86_init.c                         |  21 +++
 drivers/irqchip/irq-armada-370-xp.c                | 153 ++++++++++++++++++++-
 drivers/pci/Kconfig                                |   4 -
 drivers/pci/host/pci-mvebu.c                       |  31 +++++
 drivers/pci/msi.c                                  |  66 +++++----
 drivers/pci/probe.c                                |   1 +
 include/linux/irqdomain.h                          |  62 ++++++++-
 include/linux/msi.h                                |  18 ++-
 include/linux/pci.h                                |   1 +
 kernel/irq/irqdomain.c                             |  89 +++++++++---
 31 files changed, 422 insertions(+), 106 deletions(-)

Signature · 7 lines

1.8.1.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Thomas,

In order to get some testing in -next, I've *tentatively* applied this series in the following way:

+---+ mvebu/msi_common (1,2,3,10)
    |
    +---+---+ mvebu/msi_irq (4-9)
            |
            +---+---+ mvebu/msi_mvebu (11-13)

I had to make one change to patch #9, I protected the last two blocks with #ifdef CONFIG_PCI_MSI to prevent a build failure at that point.

mvebu/msi_common should be appropriate for Thierry to base off, however, I make no guarantees about the stability of the branch until I send a PR for it. Code-wise, it should be fine, but the commit-ids may change due to adding Tested-by's, etc.

Quoted 11 lines · Jason Cooper

Thomas,

In order to get some testing in -next, I've *tentatively* applied this series in the following way:

+---+ mvebu/msi_common (1,2,3,10)
    |
    +---+---+ mvebu/msi_irq (4-9)
            |
            +---+---+ mvebu/msi_mvebu (11-13)

Quoted 7 lines

I had to make one change to patch #9, I protected the last two blocks with #ifdef CONFIG_PCI_MSI to prevent a build failure at that point.

mvebu/msi_common should be appropriate for Thierry to base off, however, I make no guarantees about the stability of the branch until I send a PR for it. Code-wise, it should be fine, but the commit-ids may change due to adding Tested-by's, etc.

When do you intend to send the pull-request? I need a stable branch before I can even apply Thierry's changes, and I'd prefer to get those changes applied and in linux-next well before I send my pull requests to arm-soc. At the very latest, I need enough time to apply Thierry's patches on top of your final version of that branch, get it briefly tested, and then send a pull-request to arm-soc before -rc6 is out, so if your pull request goes in just before -rc6, that's going to be a problem.

Thomas,

In order to get some testing in -next, I've *tentatively* applied this series in the following way:

+---+ mvebu/msi_common (1,2,3,10)
    |
    +---+---+ mvebu/msi_irq (4-9)
            |
            +---+---+ mvebu/msi_mvebu (11-13)

I had to make one change to patch #9, I protected the last two blocks with #ifdef CONFIG_PCI_MSI to prevent a build failure at that point.

mvebu/msi_common should be appropriate for Thierry to base off, however, I make no guarantees about the stability of the branch until I send a PR for it. Code-wise, it should be fine, but the commit-ids may change due to adding Tested-by's, etc.

Quoted 11 lines · Jason Cooper

Thomas,

In order to get some testing in -next, I've *tentatively* applied this series in the following way:

+---+ mvebu/msi_common (1,2,3,10)
    |
    +---+---+ mvebu/msi_irq (4-9)
            |
            +---+---+ mvebu/msi_mvebu (11-13)

Quoted 7 lines

I had to make one change to patch #9, I protected the last two blocks with #ifdef CONFIG_PCI_MSI to prevent a build failure at that point.

mvebu/msi_common should be appropriate for Thierry to base off, however, I make no guarantees about the stability of the branch until I send a PR for it. Code-wise, it should be fine, but the commit-ids may change due to adding Tested-by's, etc.

I noticed that patch 10 has my Reviewed-by, even though my comments weren't addressed. They were about stylistic issues but I'd still like to see them fixed now rather than having to fix them up later. Also I think I gave my Tested-by on those patches somewhere already and I think it's unlikely that anybody else will test them, so with the consistency style fixes applied I don't see any reason why that branch can't be stabilized right away.