From patchwork Mon Jan 8 13:48:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raghavendra X-Patchwork-Id: 10149643 X-Patchwork-Delegate: bhelgaas@google.com 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 EE13D601BE for ; Mon, 8 Jan 2018 13:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D703028538 for ; Mon, 8 Jan 2018 13:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB5B0285D5; Mon, 8 Jan 2018 13:48:30 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29A6828355 for ; Mon, 8 Jan 2018 13:48:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756308AbeAHNs2 (ORCPT ); Mon, 8 Jan 2018 08:48:28 -0500 Received: from lelnx193.ext.ti.com ([198.47.27.77]:19280 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756216AbeAHNs1 (ORCPT ); Mon, 8 Jan 2018 08:48:27 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w08DmL5q029685; Mon, 8 Jan 2018 07:48:21 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1515419301; bh=m8wvsUocGgQiSKGVtU5tUnrLC1yZn7mMrJXAZ1D1fgU=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=T1PQHfl7ZEP+0qvIw+AAPjMgpU1HqZ9re+V2WKp0NcOuucKbYsk84a05nLWa3vUZO sLbbXR7EyxeSEft0oIGKcX+F/tyDmlZ43fCMT/SRyJ6S6OCVinlMrsqPlirUMShUSM j8R93UOVcwu0I0kK+jyfaSN44RcI129g6bmzPH/o= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w08DmLhp025773; Mon, 8 Jan 2018 07:48:21 -0600 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 8 Jan 2018 07:48:21 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 8 Jan 2018 07:48:21 -0600 Received: from [172.24.190.89] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w08DmJkN005753; Mon, 8 Jan 2018 07:48:19 -0600 Subject: Re: [PATCH v2 1/2] PCI: dra7xx: Fix legacy INTD IRQ handling To: Lorenzo Pieralisi , Kishon Vijay Abraham I CC: Bjorn Helgaas , , , References: <20171229114131.22296-1-vigneshr@ti.com> <20171229114131.22296-2-vigneshr@ti.com> <953c7aac-0429-8fc7-02ce-ace94aa735f3@ti.com> <20180104161202.GB12239@red-moon> From: Vignesh R Message-ID: <493a4f80-677c-b213-d13a-e922b28c38e0@ti.com> Date: Mon, 8 Jan 2018 19:18:59 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180104161202.GB12239@red-moon> Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thursday 04 January 2018 09:42 PM, Lorenzo Pieralisi wrote: > On Thu, Jan 04, 2018 at 07:04:30PM +0530, Kishon Vijay Abraham I wrote: >> Hi, >> >> On Thursday 04 January 2018 11:38 AM, Kishon Vijay Abraham I wrote: >>> >>> >>> On Friday 29 December 2017 05:11 PM, Vignesh R wrote: >>>> 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. >>>> >>>> Suggested-by: Bjorn Helgaas >>>> Reported-by: Chris Welch >>>> Signed-off-by: Vignesh R >>> >>> Acked-by: Kishon Vijay Abraham I >>>> --- >>>> drivers/pci/dwc/pci-dra7xx.c | 3 ++- >>>> 1 file changed, 2 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c >>>> index 58aed0896468..892f93910012 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, >> >> Looking at this again, I think the mapping should be done in device tree using >> the interrupt-map property. >> >> Lorenzo, can you hold merging this patch till we verify using the dt approach? > > Yes and I agree that's a DT mapping bug. I did some testing by changing interrupt-map property of PCIe node as as below: call the correct handler with above change: static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) @@ -269,7 +270,7 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) case INTC: case INTD: generic_handle_irq(irq_find_mapping(dra7xx->irq_domain, - ffs(reg))); + ffs(reg) - 1)); break; } If we merge the driver change then the DT backward compatibility is broken. Right now INTA/B/C keep working even with buggy interrupt-map settings. But, if we fix interrupt-map and merge above driver change, then we will be *breaking* DT backward compatibility and INTA/B/C will no longer work with older DTs. Therefore, IMO, this patch should be merged in order to keep DT backward compatibility and live with wrong DT representation. diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 261b5deb2456..2b1a2c5303bb 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -332,10 +332,10 @@ phys = <&pcie1_phy>; phy-names = "pcie-phy0"; interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie1_intc 1>, - <0 0 0 2 &pcie1_intc 2>, - <0 0 0 3 &pcie1_intc 3>, - <0 0 0 4 &pcie1_intc 4>; + interrupt-map = <0 0 0 1 &pcie1_intc 0>, + <0 0 0 2 &pcie1_intc 1>, + <0 0 0 3 &pcie1_intc 2>, + <0 0 0 4 &pcie1_intc 3>; Although this eliminates need for xlate, we still need driver change to