From patchwork Thu Feb 27 16:41:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 3734671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 51E829F35F for ; Thu, 27 Feb 2014 16:43:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 787F4201CD for ; Thu, 27 Feb 2014 16:43:40 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81602201BA for ; Thu, 27 Feb 2014 16:43:39 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ42p-0005Sf-2L; Thu, 27 Feb 2014 16:42:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ42f-0004R5-2h; Thu, 27 Feb 2014 16:42:37 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ42T-0004Oa-CQ for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 16:42:26 +0000 Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WJ41r-00082T-5U; Thu, 27 Feb 2014 17:41:47 +0100 From: Lucas Stach To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/3] PCI: imx6: add support for MSI Date: Thu, 27 Feb 2014 17:41:45 +0100 Message-Id: <1393519305-15128-3-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393519305-15128-1-git-send-email-l.stach@pengutronix.de> References: <1393519305-15128-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_114225_794321_F2EA09A2 X-CRM114-Status: GOOD ( 17.33 ) X-Spam-Score: -1.9 (-) Cc: Richard Zhu , devicetree@vger.kernel.org, linux-pci@vger.kernel.org, kernel@pengutronix.de, Bjorn Helgaas , Mark Rutland , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Juergen Beisert Signed-off-by: Lucas Stach --- 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 #include #include +#include #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;