This patch adds support for Message Signaled Interrupt in the imx6q-pcie driver. It is done in a similar way as for the Exynos PCIe driver (commit f342d940ee0e3a2b5197fd4fbade1cb6bbc960b7), which is also using the Synopsys designware PCIe IP core.
Signed-off-by: Harro Haan <[email protected]> Signed-off-by: Juergen Beisert <[email protected]> Signed-off-by: Lucas Stach <[email protected]> --- drivers/pci/host/pci-imx6.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index ee082509b0ba..50f76581bcfb 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -25,6 +25,7 @@ #include <linux/resource.h> #include <linux/signal.h> #include <linux/types.h> +#include <linux/interrupt.h> #include "pcie-designware.h" @@ -329,6 +330,17 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp) return 0; } +/* legacy IRQD/MSI interrupt */ +static irqreturn_t imx6_pcie_irqd_msi_handler(int irq, void *arg) +{ + struct pcie_port *pp = arg; + + if (IS_ENABLED(CONFIG_PCI_MSI)) + dw_handle_msi_irq(pp); + + return IRQ_HANDLED; +} + static int imx6_pcie_start_link(struct pcie_port *pp) { struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); @@ -403,6 +415,9 @@ static void imx6_pcie_host_init(struct pcie_port *pp) dw_pcie_setup_rc(pp); imx6_pcie_start_link(pp); + + if (IS_ENABLED(CONFIG_PCI_MSI) && (pp->msi_irq >= 0)) + dw_pcie_msi_init(pp); } static void imx6_pcie_reset_phy(struct pcie_port *pp) @@ -498,6 +513,21 @@ static int imx6_add_pcie_port(struct pcie_port *pp, return -ENODEV; } + if (IS_ENABLED(CONFIG_PCI_MSI)) { + pp->msi_irq = platform_get_irq_byname(pdev, "intd/msi"); + if (pp->msi_irq < 0) { + dev_info(&pdev->dev, "failed to get INTD/MSI, PCIe will not support MSI\n"); + } else { + ret = devm_request_irq(&pdev->dev, pp->msi_irq, + imx6_pcie_irqd_msi_handler, + IRQF_SHARED, "mx6-pcie-msi", pp); + if (ret) { + dev_err(&pdev->dev, "failed to request INTD/MSI irq\n"); + return -ENODEV; + } + } + } + pp->root_bus_nr = -1; pp->ops = &imx6_pcie_host_ops; -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
