From patchwork Wed Jul 6 08:38:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 9215691 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 B5D49607D9 for ; Wed, 6 Jul 2016 08:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A66162878F for ; Wed, 6 Jul 2016 08:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AAA628792; Wed, 6 Jul 2016 08:42:50 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 2D2122878F for ; Wed, 6 Jul 2016 08:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227AbcGFImm (ORCPT ); Wed, 6 Jul 2016 04:42:42 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:39467 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263AbcGFImH (ORCPT ); Wed, 6 Jul 2016 04:42:07 -0400 Received: from 172.24.1.136 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.136]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CEJ45476; Wed, 06 Jul 2016 16:38:32 +0800 (CST) Received: from [127.0.0.1] (10.61.21.156) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Wed, 6 Jul 2016 16:38:21 +0800 Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk To: Po Liu , "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" References: <1464242406-20203-1-git-send-email-po.liu@nxp.com> <1465892645-32381-1-git-send-email-po.liu@nxp.com> <1465892645-32381-2-git-send-email-po.liu@nxp.com> <577A21E4.1030301@huawei.com> CC: Bjorn Helgaas , Shawn Guo , "Marc Zyngier" , Rob Herring , Roy Zang , Mingkai Hu , Stuart Yoder , Yang-Leo Li , Arnd Bergmann , Minghuan Lian , Murali Karicheri , Linuxarm From: Dongdong Liu Message-ID: <577CC37B.9070806@huawei.com> Date: Wed, 6 Jul 2016 16:38:19 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [10.61.21.156] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.577CC389.00C5, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 74dca79077ca4311682ce598d8bc6f92 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 Hi Po 在 2016/7/5 11:03, Po Liu 写道: > Hi Dongdong, > > The patch were intend to fixup the NXP layerscape serial SOC and were tested ok. > I am not clear what platform are you trying to fix. My platform is an ARM64 platform, PCIe host controller also use Synopsys Designware. > The problem on your board may be as below comments: > > >> -----Original Message----- >> From: Dongdong Liu [mailto:liudongdong3@huawei.com] >> Sent: Monday, July 04, 2016 4:44 PM >> To: Po Liu; linux-pci@vger.kernel.org; linux-arm- >> kernel@lists.infradead.org; linux-kernel@vger.kernel.org; >> devicetree@vger.kernel.org >> Cc: Bjorn Helgaas; Shawn Guo; Marc Zyngier; Rob Herring; Roy Zang; >> Mingkai Hu; Stuart Yoder; Yang-Leo Li; Arnd Bergmann; Minghuan Lian; >> Murali Karicheri; Linuxarm >> Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk >> >> Hi Po >> >> I found a problem with the similar patch. as the below log. >> >> [ 4.287060] pci 0000:80:00.0: quirk_aer_interrupt dev->irq 416 >> [ 4.293778] pcieport 0000:80:00.0: pci_device_probe in >> [ 4.299605] pcieport 0000:80:00.0: of_irq_parse_pci() failed with >> rc=-22 >> [ 4.307209] pcieport 0000:80:00.0: init_service_irqs dev->irq 0 >> >> The fucntions are called as below sequence. >> 1. quirk_aer_interrupt, get the aer dev->irq 416. > > This code quirk_aer_interrupt() should be run at pci_fixup_device(pci_fixup_final) which is in the pci_bus_add_devices() Yes, you are right. > >> 2. pci_device_probe->of_irq_parse_pci, of_irq_parse_pci() failed, then >> dev->irq changed to 0. > > pci_device_probe->of_irq_parse_pci which in the pci_scan_child_bus() run before pci_bus_add_devices(). See dw_pcie_host_init(). > Apparently , your quirk_aer_interrupt() is running before the dev->irq assignment in the of_irq_parse_pci(). > > So make sure your configure the quirk_aer_interrupt() run in the FINAL stage in the quirk.c OR check your host driver which you are using. Yes , It is FINAL stage in the quirk. I use DECLARE_PCI_FIXUP_FINAL. I find it is the below patch affect this. (https://patchwork.kernel.org/patch/9170333/), but the patch will be applied to linux 4.8. So the problem will also be existed. ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code Thanks Dongdong > > >> >> So this patch could not work with aer. >> >> Thanks >> Dongdong >> 在 2016/6/14 16:24, Po Liu 写道: >> > On some platforms, root port doesn't support MSI/MSI-X/INTx in RC mode. >> > When chip support the aer interrupt with none MSI/MSI-X/INTx mode, >> > maybe there is interrupt line for aer pme etc. Search the interrupt >> > number in the fdt file. Then fixup the dev->irq with it. >> > >> > Signed-off-by: Po Liu >> > --- >> > changes for V3: >> > - Move to quirk; >> > - Only correct the irq in RC mode; >> > >> > drivers/pci/quirks.c | 29 +++++++++++++++++++++++++++++ >> > 1 file changed, 29 insertions(+) >> > >> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index >> > ee72ebe..8b39cce 100644 >> > --- a/drivers/pci/quirks.c >> > +++ b/drivers/pci/quirks.c >> > @@ -25,6 +25,7 @@ >> > #include >> > #include >> > #include >> > +#include >> > #include /* isa_dma_bridge_buggy */ >> > #include "pci.h" >> > >> > @@ -4419,3 +4420,31 @@ static void quirk_intel_qat_vf_cap(struct >> pci_dev *pdev) >> > } >> > } >> > DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, >> > quirk_intel_qat_vf_cap); >> > + >> > +/* If root port doesn't support MSI/MSI-X/INTx in RC mode, >> > + * but use standalone irq. Read the device tree for the aer >> > + * interrupt number. >> > + */ >> > +static void quirk_aer_interrupt(struct pci_dev *dev) { >> > + int ret; >> > + u8 header_type; >> > + struct device_node *np = NULL; >> > + >> > + /* Only for the RC mode device */ >> > + pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); >> > + if ((header_type & 0x7F) != PCI_HEADER_TYPE_BRIDGE) >> > + return; >> > + >> > + if (dev->bus->dev.of_node) >> > + np = dev->bus->dev.of_node; >> > + >> > + if (IS_ENABLED(CONFIG_OF_IRQ) && np) { >> > + ret = of_irq_get_byname(np, "aer"); >> > + if (ret > 0) { >> > + dev->no_msi = 1; >> > + dev->irq = ret; >> > + } >> > + } >> > +} >> > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, >> > +quirk_aer_interrupt); >> > >> > > �{.n�+�������+%��lzwm��b�맲��r��zX��\�)���w*jg��������ݢj/���z�ޖ��2�ޙ���&�)ߡ�a�����G���h��j:+v���w�٥ > --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index d5d3d26..b3b8a2c 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -51,11 +51,16 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) } /* - * Try to assign the IRQ number from DT when adding a new device + * Try to assign the IRQ number when probing a new device */ -int pcibios_add_device(struct pci_dev *dev) +int pcibios_alloc_irq(struct pci_dev *dev) { - dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); + if (acpi_disabled) + dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); +#ifdef CONFIG_ACPI + else + return acpi_pci_irq_enable(dev); +#endif return 0; }