From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756260AbcIULZJ (ORCPT ); Wed, 21 Sep 2016 07:25:09 -0400 Received: from mail-db5eur01on0087.outbound.protection.outlook.com ([104.47.2.87]:56000 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751939AbcIULZG (ORCPT ); Wed, 21 Sep 2016 07:25:06 -0400 From: Po Liu To: Bjorn Helgaas CC: Roy Zang , Arnd Bergmann , "devicetree@vger.kernel.org" , Marc Zyngier , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stuart Yoder , "M.H. Lian" , Murali Karicheri , Mingkai Hu , Bjorn Helgaas , Leo Li , Shawn Guo , "linux-arm-kernel@lists.infradead.org" Subject: RE: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk Thread-Topic: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk Thread-Index: AQHRxheZVDdmrKa9D0uquNOaIWgAJqAwSJ8AgCTimSCALkj7gIAAojsA Date: Wed, 21 Sep 2016 06:51:55 +0000 Message-ID: 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> <20160729224154.GC13632@localhost> <20160920204725.GA10804@localhost> In-Reply-To: <20160920204725.GA10804@localhost> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=po.liu@nxp.com; x-originating-ip: [123.151.195.51] x-ms-office365-filtering-correlation-id: 93d97161-1a49-4c59-6cdb-08d3e1ebc70f x-microsoft-exchange-diagnostics: 1;VI1PR0401MB2640;6:bFUAdXayr1lAKYpijLxd0FIO9cqdKG761Ys7xl6YxBGt0EcbBsOnyth5QQ5Lq4CXcOzfYfS/KmTqhao243oGlYQAzKlHwmh4eafYE9VsgBbcIlExndv7Eo20XB3AZpNySjRnQwLoRYYob9W5JAeQ8xt8WgbEVt/Y96+uiadu1irdt5zWw56ApleQxK1IkknOVU2pUNsNc21ObDw71isE0Spj2ce+fgf936togyWiTeVrBOejutxBbNKhw5TRDppt+MWWJDpL3DWYn+VyAEMXZuWRdnZvAiLzUv3CmXw3S6PlxCjq+rIAc3Rrt5wnXvQXZ2AmgarJ30gtl0Wgq8Fvzw==;5:+VORd46Hi8UwXFwpceRUkHVeTbhL8q+4HkmDMlS2x1KP1xTLFN4A2qtJlE1G4f7WSzGUrklRYg22sODQ3+IXi6cRH1w7RXlQ6OZUqwr37uggBfWaVzAS7V955M9IWsDBo9IDpGka+66f8kioEdmnJQ==;24:ITETimr+GJSfq2jC0WYXw8ZLEUVjJmJz7+NHqHxmZCeJto5bzaTTNokLGlfSstTBQJUmDF/uMYFM7NlgnGyFLaUlPEGvy3T7StAmPbMVpHg=;7:zZKigEVAObpLhJrdcc01j2w4zwDbjPD/tp1iF1iUHBhfxLPS53H1beK91jPV2JHqsrQ3pMAHJuE2G10Wrm8QyZGdXYkFJYbonaA39MCEu+F66UFV+K5NpLIikM4DKMsuJ/1hWWezS99EKzFeZ2LG7qUFlYiqTN/brZhq26TI0oOEJUluN1tj7qmt4ZeDX0EZ9ZQg+1vPxbIyK9/PODdDKH5Ef6dbTMeq6xLrezxxrBX1CuCJz/U0Bs+zjfkbofX25fKiaN1oS92AUmJlCLWc9RMFKCGsDTaji1uipOPwzSrLnG+cGNBNtLULF38skByu x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0401MB2640; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055)(185117386973197)(258649278758335); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026);SRVR:VI1PR0401MB2640;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0401MB2640; x-forefront-prvs: 007271867D x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(7916002)(13464003)(199003)(51444003)(24454002)(377454003)(189002)(81156014)(110136003)(10400500002)(81166006)(5660300001)(74316002)(7846002)(305945005)(2950100001)(19580395003)(9686002)(5002640100001)(92566002)(19580405001)(87936001)(8936002)(15975445007)(7696004)(7416002)(11100500001)(77096005)(2900100001)(86362001)(189998001)(102836003)(106356001)(586003)(101416001)(106116001)(122556002)(2906002)(33656002)(3280700002)(105586002)(97736004)(8676002)(3846002)(6116002)(76576001)(54356999)(7736002)(68736007)(3660700001)(66066001)(50986999)(76176999)(4326007)(93886004)(1720100001)(21314002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0401MB2640;H:VI1PR0401MB1709.eurprd04.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Sep 2016 06:51:55.9840 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2640 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u8LBPFU2006945 Hi Bjorn, > -----Original Message----- > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > Sent: Wednesday, September 21, 2016 4:47 AM > To: Po Liu > Cc: Roy Zang; Arnd Bergmann; devicetree@vger.kernel.org; Marc Zyngier; > linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org; Stuart Yoder; > M.H. Lian; Murali Karicheri; Mingkai Hu; Bjorn Helgaas; Leo Li; Shawn > Guo; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > On Mon, Aug 22, 2016 at 10:09:18AM +0000, Po Liu wrote: > > Hi Bjorn, > > > > Sorry for late reply. > > > > I checked the updated kernel with Dongdong mentioned ACPI patch which > was truly affected my quirk patch uploaded. So I suppose the quirk patch > is not qualify to fix the bug. > > I don't understand what you're saying here. > > The quirk worked on your machine. It apparently didn't work on > Dongdong's machine because of_irq_parse_and_map_pci() is run after the > quirk in this path: > > pci_device_probe > pcibios_alloc_irq # arm64 > dev->irq = of_irq_parse_and_map_pci > > and of_irq_parse_and_map_pci() returned zero, probably because > of_irq_parse_pci() failed. My guess is that the reason it works on your > machine but not Dongdong's is that your DTs are different such that > of_irq_parse_pci() works for you but not for Dongdong. > > I think the idea of of_irq_parse_and_map_pci() is to set up a device's > INTx line. But that doesn't quite apply here because your device > doesn't actually *use* INTx. So I don't know why of_irq_parse_pci() > works for you. Maybe that's a symptom of a problem in your DT. > > Or maybe you're saying that the quirk *didn't* work on your machine when > you tested it in a kernel that included d8ed75d59332 ("ARM64: > PCI: ACPI support for legacy IRQs parsing and consolidation with DT > code"). Yes, this point is what I mean. After this patch my quirk patch would not work. Since I discussed with Dongdong, the patches d8ed75d59332 ACPI related were not be merged yet. > But that doesn't make sense either, because prior to > d8ed75d59332, we *always* set > > dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > > and after the patch we only do it if "acpi_disabled". I guess I just > don't understand what you're saying. Before the patch merged. pcibios_add_device()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);) was loaded before the pci_fixup_device(pci_fixup_final). But after the patch d8ed75d59332("ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code") merged, the pci_fixup_device(pci_fixup_final) run BEFORE the pcibios_alloc_irq()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);). So the dev->irq were overwhelm by the pcibios_alloc_irq(). When I test, the acpi_disabled is '1' although my kernel config default is CONFIG_ACPI=y. And no setting in the uboot with apci=xxx. But this is another issue, I didn't deep to check it. > > > I were keep thinking what your "explicitly checking for a root port > device" meaning. Do you mean I should upload again the first version > patch which fix it in the portdrv_core.c ? I would upload again if yes. > > No, I did not mean you should go back to the first version of the patch. > If we *can* do this in a quirk, I think that would be much better than > doing it in the PCIe port driver. I meant that Dongdong's suggestion of > adding this: > > if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) > return; > > to your quirk made sense to me. If the quirk patch could make workaround. It should be the better way. Po Liu > > > > -----Original Message----- > > > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > > > Sent: Saturday, July 30, 2016 6:42 AM > > > To: Po Liu > > > Cc: linux-pci@vger.kernel.org; > > > linux-arm-kernel@lists.infradead.org; > > > linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; Roy Zang; > > > Arnd Bergmann; Marc Zyngier; Stuart Yoder; Yang-Leo Li; Minghuan > > > Lian; Murali Karicheri; Bjorn Helgaas; Shawn Guo; Mingkai Hu > > > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > > > > > On Tue, Jun 14, 2016 at 04:24:05PM +0800, Po Liu wrote: > > > > 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 > > > > > > I'm not sure where we're at with this. Dongdong had some issue > > > (possibly with a version of the quirk on a different platform?), and > > > I think the suggestion of explicitly checking for a root port > > > device was a good one. > > > > > > So please update and repost this for next cycle. > > > > > > > --- > > > > 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); > -- > 2.1.0.27.g96db324 > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Po Liu Subject: RE: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk Date: Wed, 21 Sep 2016 06:51:55 +0000 Message-ID: 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> <20160729224154.GC13632@localhost> <20160920204725.GA10804@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160920204725.GA10804@localhost> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Bjorn Helgaas Cc: Roy Zang , Arnd Bergmann , "devicetree@vger.kernel.org" , Marc Zyngier , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stuart Yoder , "M.H. Lian" , Murali Karicheri , "linux-arm-kernel@lists.infradead.org" , Bjorn Helgaas , Leo Li , Shawn Guo , Mingkai Hu List-Id: devicetree@vger.kernel.org Hi Bjorn, > -----Original Message----- > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > Sent: Wednesday, September 21, 2016 4:47 AM > To: Po Liu > Cc: Roy Zang; Arnd Bergmann; devicetree@vger.kernel.org; Marc Zyngier; > linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org; Stuart Yoder; > M.H. Lian; Murali Karicheri; Mingkai Hu; Bjorn Helgaas; Leo Li; Shawn > Guo; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > On Mon, Aug 22, 2016 at 10:09:18AM +0000, Po Liu wrote: > > Hi Bjorn, > > > > Sorry for late reply. > > > > I checked the updated kernel with Dongdong mentioned ACPI patch which > was truly affected my quirk patch uploaded. So I suppose the quirk patch > is not qualify to fix the bug. > > I don't understand what you're saying here. > > The quirk worked on your machine. It apparently didn't work on > Dongdong's machine because of_irq_parse_and_map_pci() is run after the > quirk in this path: > > pci_device_probe > pcibios_alloc_irq # arm64 > dev->irq = of_irq_parse_and_map_pci > > and of_irq_parse_and_map_pci() returned zero, probably because > of_irq_parse_pci() failed. My guess is that the reason it works on your > machine but not Dongdong's is that your DTs are different such that > of_irq_parse_pci() works for you but not for Dongdong. > > I think the idea of of_irq_parse_and_map_pci() is to set up a device's > INTx line. But that doesn't quite apply here because your device > doesn't actually *use* INTx. So I don't know why of_irq_parse_pci() > works for you. Maybe that's a symptom of a problem in your DT. > > Or maybe you're saying that the quirk *didn't* work on your machine when > you tested it in a kernel that included d8ed75d59332 ("ARM64: > PCI: ACPI support for legacy IRQs parsing and consolidation with DT > code"). Yes, this point is what I mean. After this patch my quirk patch would not work. Since I discussed with Dongdong, the patches d8ed75d59332 ACPI related were not be merged yet. > But that doesn't make sense either, because prior to > d8ed75d59332, we *always* set > > dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > > and after the patch we only do it if "acpi_disabled". I guess I just > don't understand what you're saying. Before the patch merged. pcibios_add_device()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);) was loaded before the pci_fixup_device(pci_fixup_final). But after the patch d8ed75d59332("ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code") merged, the pci_fixup_device(pci_fixup_final) run BEFORE the pcibios_alloc_irq()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);). So the dev->irq were overwhelm by the pcibios_alloc_irq(). When I test, the acpi_disabled is '1' although my kernel config default is CONFIG_ACPI=y. And no setting in the uboot with apci=xxx. But this is another issue, I didn't deep to check it. > > > I were keep thinking what your "explicitly checking for a root port > device" meaning. Do you mean I should upload again the first version > patch which fix it in the portdrv_core.c ? I would upload again if yes. > > No, I did not mean you should go back to the first version of the patch. > If we *can* do this in a quirk, I think that would be much better than > doing it in the PCIe port driver. I meant that Dongdong's suggestion of > adding this: > > if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) > return; > > to your quirk made sense to me. If the quirk patch could make workaround. It should be the better way. Po Liu > > > > -----Original Message----- > > > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > > > Sent: Saturday, July 30, 2016 6:42 AM > > > To: Po Liu > > > Cc: linux-pci@vger.kernel.org; > > > linux-arm-kernel@lists.infradead.org; > > > linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; Roy Zang; > > > Arnd Bergmann; Marc Zyngier; Stuart Yoder; Yang-Leo Li; Minghuan > > > Lian; Murali Karicheri; Bjorn Helgaas; Shawn Guo; Mingkai Hu > > > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > > > > > On Tue, Jun 14, 2016 at 04:24:05PM +0800, Po Liu wrote: > > > > 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 > > > > > > I'm not sure where we're at with this. Dongdong had some issue > > > (possibly with a version of the quirk on a different platform?), and > > > I think the suggestion of explicitly checking for a root port > > > device was a good one. > > > > > > So please update and repost this for next cycle. > > > > > > > --- > > > > 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); > -- > 2.1.0.27.g96db324 > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: From: Po Liu To: Bjorn Helgaas Subject: RE: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk Date: Wed, 21 Sep 2016 06:51:55 +0000 Message-ID: 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> <20160729224154.GC13632@localhost> <20160920204725.GA10804@localhost> In-Reply-To: <20160920204725.GA10804@localhost> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roy Zang , Arnd Bergmann , "devicetree@vger.kernel.org" , Marc Zyngier , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stuart Yoder , "M.H. Lian" , Murali Karicheri , "linux-arm-kernel@lists.infradead.org" , Bjorn Helgaas , Leo Li , Shawn Guo , Mingkai Hu Content-Type: text/plain; charset="us-ascii" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+bjorn=helgaas.com@lists.infradead.org List-ID: Hi Bjorn, > -----Original Message----- > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > Sent: Wednesday, September 21, 2016 4:47 AM > To: Po Liu > Cc: Roy Zang; Arnd Bergmann; devicetree@vger.kernel.org; Marc Zyngier; > linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org; Stuart Yoder; > M.H. Lian; Murali Karicheri; Mingkai Hu; Bjorn Helgaas; Leo Li; Shawn > Guo; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > On Mon, Aug 22, 2016 at 10:09:18AM +0000, Po Liu wrote: > > Hi Bjorn, > > > > Sorry for late reply. > > > > I checked the updated kernel with Dongdong mentioned ACPI patch which > was truly affected my quirk patch uploaded. So I suppose the quirk patch > is not qualify to fix the bug. > > I don't understand what you're saying here. > > The quirk worked on your machine. It apparently didn't work on > Dongdong's machine because of_irq_parse_and_map_pci() is run after the > quirk in this path: > > pci_device_probe > pcibios_alloc_irq # arm64 > dev->irq = of_irq_parse_and_map_pci > > and of_irq_parse_and_map_pci() returned zero, probably because > of_irq_parse_pci() failed. My guess is that the reason it works on your > machine but not Dongdong's is that your DTs are different such that > of_irq_parse_pci() works for you but not for Dongdong. > > I think the idea of of_irq_parse_and_map_pci() is to set up a device's > INTx line. But that doesn't quite apply here because your device > doesn't actually *use* INTx. So I don't know why of_irq_parse_pci() > works for you. Maybe that's a symptom of a problem in your DT. > > Or maybe you're saying that the quirk *didn't* work on your machine when > you tested it in a kernel that included d8ed75d59332 ("ARM64: > PCI: ACPI support for legacy IRQs parsing and consolidation with DT > code"). Yes, this point is what I mean. After this patch my quirk patch would not work. Since I discussed with Dongdong, the patches d8ed75d59332 ACPI related were not be merged yet. > But that doesn't make sense either, because prior to > d8ed75d59332, we *always* set > > dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > > and after the patch we only do it if "acpi_disabled". I guess I just > don't understand what you're saying. Before the patch merged. pcibios_add_device()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);) was loaded before the pci_fixup_device(pci_fixup_final). But after the patch d8ed75d59332("ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code") merged, the pci_fixup_device(pci_fixup_final) run BEFORE the pcibios_alloc_irq()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);). So the dev->irq were overwhelm by the pcibios_alloc_irq(). When I test, the acpi_disabled is '1' although my kernel config default is CONFIG_ACPI=y. And no setting in the uboot with apci=xxx. But this is another issue, I didn't deep to check it. > > > I were keep thinking what your "explicitly checking for a root port > device" meaning. Do you mean I should upload again the first version > patch which fix it in the portdrv_core.c ? I would upload again if yes. > > No, I did not mean you should go back to the first version of the patch. > If we *can* do this in a quirk, I think that would be much better than > doing it in the PCIe port driver. I meant that Dongdong's suggestion of > adding this: > > if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) > return; > > to your quirk made sense to me. If the quirk patch could make workaround. It should be the better way. Po Liu > > > > -----Original Message----- > > > From: Bjorn Helgaas [mailto:helgaas@kernel.org] > > > Sent: Saturday, July 30, 2016 6:42 AM > > > To: Po Liu > > > Cc: linux-pci@vger.kernel.org; > > > linux-arm-kernel@lists.infradead.org; > > > linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; Roy Zang; > > > Arnd Bergmann; Marc Zyngier; Stuart Yoder; Yang-Leo Li; Minghuan > > > Lian; Murali Karicheri; Bjorn Helgaas; Shawn Guo; Mingkai Hu > > > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > > > > > On Tue, Jun 14, 2016 at 04:24:05PM +0800, Po Liu wrote: > > > > 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 > > > > > > I'm not sure where we're at with this. Dongdong had some issue > > > (possibly with a version of the quirk on a different platform?), and > > > I think the suggestion of explicitly checking for a root port > > > device was a good one. > > > > > > So please update and repost this for next cycle. > > > > > > > --- > > > > 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); > -- > 2.1.0.27.g96db324 > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: po.liu@nxp.com (Po Liu) Date: Wed, 21 Sep 2016 06:51:55 +0000 Subject: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk In-Reply-To: <20160920204725.GA10804@localhost> 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> <20160729224154.GC13632@localhost> <20160920204725.GA10804@localhost> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Bjorn, > -----Original Message----- > From: Bjorn Helgaas [mailto:helgaas at kernel.org] > Sent: Wednesday, September 21, 2016 4:47 AM > To: Po Liu > Cc: Roy Zang; Arnd Bergmann; devicetree at vger.kernel.org; Marc Zyngier; > linux-pci at vger.kernel.org; linux-kernel at vger.kernel.org; Stuart Yoder; > M.H. Lian; Murali Karicheri; Mingkai Hu; Bjorn Helgaas; Leo Li; Shawn > Guo; linux-arm-kernel at lists.infradead.org > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > On Mon, Aug 22, 2016 at 10:09:18AM +0000, Po Liu wrote: > > Hi Bjorn, > > > > Sorry for late reply. > > > > I checked the updated kernel with Dongdong mentioned ACPI patch which > was truly affected my quirk patch uploaded. So I suppose the quirk patch > is not qualify to fix the bug. > > I don't understand what you're saying here. > > The quirk worked on your machine. It apparently didn't work on > Dongdong's machine because of_irq_parse_and_map_pci() is run after the > quirk in this path: > > pci_device_probe > pcibios_alloc_irq # arm64 > dev->irq = of_irq_parse_and_map_pci > > and of_irq_parse_and_map_pci() returned zero, probably because > of_irq_parse_pci() failed. My guess is that the reason it works on your > machine but not Dongdong's is that your DTs are different such that > of_irq_parse_pci() works for you but not for Dongdong. > > I think the idea of of_irq_parse_and_map_pci() is to set up a device's > INTx line. But that doesn't quite apply here because your device > doesn't actually *use* INTx. So I don't know why of_irq_parse_pci() > works for you. Maybe that's a symptom of a problem in your DT. > > Or maybe you're saying that the quirk *didn't* work on your machine when > you tested it in a kernel that included d8ed75d59332 ("ARM64: > PCI: ACPI support for legacy IRQs parsing and consolidation with DT > code"). Yes, this point is what I mean. After this patch my quirk patch would not work. Since I discussed with Dongdong, the patches d8ed75d59332 ACPI related were not be merged yet. > But that doesn't make sense either, because prior to > d8ed75d59332, we *always* set > > dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > > and after the patch we only do it if "acpi_disabled". I guess I just > don't understand what you're saying. Before the patch merged. pcibios_add_device()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);) was loaded before the pci_fixup_device(pci_fixup_final). But after the patch d8ed75d59332("ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code") merged, the pci_fixup_device(pci_fixup_final) run BEFORE the pcibios_alloc_irq()(which run the ->irq = of_irq_parse_and_map_pci(dev, 0, 0);). So the dev->irq were overwhelm by the pcibios_alloc_irq(). When I test, the acpi_disabled is '1' although my kernel config default is CONFIG_ACPI=y. And no setting in the uboot with apci=xxx. But this is another issue, I didn't deep to check it. > > > I were keep thinking what your "explicitly checking for a root port > device" meaning. Do you mean I should upload again the first version > patch which fix it in the portdrv_core.c ? I would upload again if yes. > > No, I did not mean you should go back to the first version of the patch. > If we *can* do this in a quirk, I think that would be much better than > doing it in the PCIe port driver. I meant that Dongdong's suggestion of > adding this: > > if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) > return; > > to your quirk made sense to me. If the quirk patch could make workaround. It should be the better way. Po Liu > > > > -----Original Message----- > > > From: Bjorn Helgaas [mailto:helgaas at kernel.org] > > > Sent: Saturday, July 30, 2016 6:42 AM > > > To: Po Liu > > > Cc: linux-pci at vger.kernel.org; > > > linux-arm-kernel at lists.infradead.org; > > > linux-kernel at vger.kernel.org; devicetree at vger.kernel.org; Roy Zang; > > > Arnd Bergmann; Marc Zyngier; Stuart Yoder; Yang-Leo Li; Minghuan > > > Lian; Murali Karicheri; Bjorn Helgaas; Shawn Guo; Mingkai Hu > > > Subject: Re: [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk > > > > > > On Tue, Jun 14, 2016 at 04:24:05PM +0800, Po Liu wrote: > > > > 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 > > > > > > I'm not sure where we're at with this. Dongdong had some issue > > > (possibly with a version of the quirk on a different platform?), and > > > I think the suggestion of explicitly checking for a root port > > > device was a good one. > > > > > > So please update and repost this for next cycle. > > > > > > > --- > > > > 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); > -- > 2.1.0.27.g96db324 > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel at lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel at lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel