From patchwork Fri Dec 1 06:13:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raghavendra X-Patchwork-Id: 10086351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E5F86037E for ; Fri, 1 Dec 2017 06:30:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 295462A50A for ; Fri, 1 Dec 2017 06:30:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CD1F2A50D; Fri, 1 Dec 2017 06:30:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9AA342A50A for ; Fri, 1 Dec 2017 06:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Bhp3Skd7j4AiAQV/DzAIGwUjMXF+k2bHTvpXO6M7ghk=; b=LsBiHwJU3GkpLy HzesttsMoy26HLlo2I6kHLgq+PqnmkutJnXVkl9WbEBaEW+wBPK9RR/oYPibXvPo4A8NByltrDjDY Fyqu9RUEOC0u+iO8qf36+8W9B40cu7cFPtWTtChKT9RPXhzQW0MDu97TvFIoZEfmm+oc+21h+dVTy hwDLXI5Ew587qVlOEX0cez9QMoNv9luY/4+Iv9PuckHrlmyg3Sn0629KUUElTMf7C4g28KzU4eiDz FG/IvQkMs4IsGUZkV4QD3N2yePYa6wjet8r+L4ytc3a2LnZ6eGpJ2i3hnwhdNGJD9d4ZOAEVVo4uQ yJpj2W98NWoqNOYxoBAA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKeq7-0007CD-31; Fri, 01 Dec 2017 06:30:23 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKekd-00029K-3k for linux-arm-kernel@bombadil.infradead.org; Fri, 01 Dec 2017 06:24:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vl3K2p2bX4jkmVwAm2dQmJ/hvv7p9ShYKV22nUORa+c=; b=pGKQtNDlSeSdjUkO71oyI17yi 9oEhOuKa6aulGAG7js14j3868u1Z1uxTaGgZt8n+KMEINCEXhBt4ncpKaTL92hxX8rHHkKymy++WB 8si3n3a5nhG7DWpKfWbNS8nUTBQMfthP5MJ8gutX1l0r4/AFmlR/NbMiMtXQUKM4NQa2BLRPSLUug KaZAnrJ6tZv380mYfYnyRZH3le+dvnCsJnmweTjvDcJxBqTgaxyIwI7Ka61CRyjLVJVWm+bRgelQJ EnHsdJXr0cozQUPNXVZj8V4Gtn4ebZptOdgjRrPt0lxWHYfqlcVSLlkSwHkrWUKwT/HBKS9O0dsf8 7OcduomKw==; Received: from fllnx210.ext.ti.com ([198.47.19.17]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKeZp-0005mj-Ip for linux-arm-kernel@lists.infradead.org; Fri, 01 Dec 2017 06:13:34 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id vB16D4vn008406; Fri, 1 Dec 2017 00:13:04 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1512108784; bh=cJ76b5v26c4mtDWRQwgyWbzxZpdVn4l24rVvRMQhShY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tGh6bcSfQJ9Aic/oZ+igAG75SjsqNwpBWJYj/EbuFnjtngKRiPlAYHxNYv7/Qvy0E WkIqbzcpKbMtcSRssjJBeU0CwREZVqaUSnts+HINVGdhY93Tn3OX8B3epF/bX3tyP6 ENig6sB7nC0JKuHsHpKAlu5GL2T4hfDdzX8Gu01s= Received: from DLEE101.ent.ti.com (dlee101.ent.ti.com [157.170.170.31]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id vB16D4rV022153; Fri, 1 Dec 2017 00:13:04 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Fri, 1 Dec 2017 00:13:04 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Fri, 1 Dec 2017 00:13:04 -0600 Received: from a0132425.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id vB16CjTe013757; Fri, 1 Dec 2017 00:13:01 -0600 From: Vignesh R To: Bjorn Helgaas , Rob Herring , Tony Lindgren , Chris Welch Subject: [PATCH 4/4] PCI: dwc: pci-dra7xx: Fix legacy IRQ handling Date: Fri, 1 Dec 2017 11:43:11 +0530 Message-ID: <20171201061311.16691-5-vigneshr@ti.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171201061311.16691-1-vigneshr@ti.com> References: <20171201061311.16691-1-vigneshr@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Lorenzo Pieralisi , Vignesh R , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Kishon Vijay Abraham I , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Legacy INTD IRQ handling is broken on dra7xx due to fact that driver uses hwirq in range of 1-4 for INTA, INTD whereas IRQ domain is of size 4 which is numbered 0-3. Therefore when INTD IRQ line is used with pci-dra7xx driver following warning is seen: WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:342 irq_domain_associate+0x12c/0x1c4 error: hwirq 0x4 is too large for dummy Fix this by using pci_irqd_intx_xlate() helper to translate the INTx 1-4 range into the 0-3 as done in other PCIe drivers. Also, iterate over all the INTx bits and call their respective IRQ handlers before clearing the status register. Suggested-by: Bjorn Helgaas Reported-by: Chris Welch Signed-off-by: Vignesh R --- drivers/pci/dwc/pci-dra7xx.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c index 53f721d1cc40..59e8de34cec6 100644 --- a/drivers/pci/dwc/pci-dra7xx.c +++ b/drivers/pci/dwc/pci-dra7xx.c @@ -226,6 +226,7 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, static const struct irq_domain_ops intx_domain_ops = { .map = dra7xx_pcie_intx_map, + .xlate = pci_irqd_intx_xlate, }; static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) @@ -256,7 +257,8 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) struct dra7xx_pcie *dra7xx = arg; struct dw_pcie *pci = dra7xx->pci; struct pcie_port *pp = &pci->pp; - u32 reg; + unsigned long reg; + u32 virq, bit; reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI); @@ -268,8 +270,11 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) case INTB: case INTC: case INTD: - generic_handle_irq(irq_find_mapping(dra7xx->irq_domain, - ffs(reg))); + for_each_set_bit(bit, ®, PCI_NUM_INTX) { + virq = irq_find_mapping(dra7xx->irq_domain, bit); + if (virq) + generic_handle_irq(virq); + } break; }