From: Tomasz Nowicki <tn@semihalf.com> To: helgaas@kernel.org, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rafael@kernel.org, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jchandra@broadcom.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jcm@redhat.com, andrea.gallo@linaro.org, dhdang@apm.com, jeremy.linton@arm.com, liudongdong3@huawei.com, cov@codeaurora.org, Tomasz Nowicki <tn@semihalf.com> Subject: [PATCH V9 09/11] ARM64/PCI: ACPI support for legacy IRQs parsing and consolidation with DT code Date: Fri, 10 Jun 2016 21:55:17 +0200 [thread overview] Message-ID: <1465588519-11334-10-git-send-email-tn@semihalf.com> (raw) In-Reply-To: <1465588519-11334-1-git-send-email-tn@semihalf.com> To enable PCI legacy IRQs on platforms booting with ACPI, arch code should include ACPI specific callbacks that parse and set-up the device IRQ number, equivalent to the DT boot path. Owing to the current ACPI core scan handlers implementation, ACPI PCI legacy IRQs bindings cannot be parsed at device add time, since that would trigger ACPI scan handlers ordering issues depending on how the ACPI tables are defined. To solve this problem and consolidate FW PCI legacy IRQs parsing in one single pcibios callback (pending final removal), this patch moves DT PCI IRQ parsing to the pcibios_alloc_irq() callback (called by PCI core code at device probe time) and adds ACPI PCI legacy IRQs parsing to the same callback too, so that FW PCI legacy IRQs parsing is confined in one single arch callback that can be easily removed when code parsing PCI legacy IRQs is consolidated and moved to core PCI code. Signed-off-by: Tomasz Nowicki <tn@semihalf.com> Suggested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> --- arch/arm64/kernel/pci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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; } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: tn@semihalf.com (Tomasz Nowicki) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V9 09/11] ARM64/PCI: ACPI support for legacy IRQs parsing and consolidation with DT code Date: Fri, 10 Jun 2016 21:55:17 +0200 [thread overview] Message-ID: <1465588519-11334-10-git-send-email-tn@semihalf.com> (raw) In-Reply-To: <1465588519-11334-1-git-send-email-tn@semihalf.com> To enable PCI legacy IRQs on platforms booting with ACPI, arch code should include ACPI specific callbacks that parse and set-up the device IRQ number, equivalent to the DT boot path. Owing to the current ACPI core scan handlers implementation, ACPI PCI legacy IRQs bindings cannot be parsed at device add time, since that would trigger ACPI scan handlers ordering issues depending on how the ACPI tables are defined. To solve this problem and consolidate FW PCI legacy IRQs parsing in one single pcibios callback (pending final removal), this patch moves DT PCI IRQ parsing to the pcibios_alloc_irq() callback (called by PCI core code at device probe time) and adds ACPI PCI legacy IRQs parsing to the same callback too, so that FW PCI legacy IRQs parsing is confined in one single arch callback that can be easily removed when code parsing PCI legacy IRQs is consolidated and moved to core PCI code. Signed-off-by: Tomasz Nowicki <tn@semihalf.com> Suggested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> --- arch/arm64/kernel/pci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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; } -- 1.9.1
next prev parent reply other threads:[~2016-06-10 19:56 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-10 19:55 [PATCH V9 00/11] Support for ARM64 ACPI based PCI host controller Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` [PATCH V9 01/11] PCI/ECAM: Move ecam.h to linux/include/pci-ecam.h Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` [PATCH V9 02/11] PCI/ECAM: Add parent device field to pci_config_window Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` [PATCH V9 03/11] PCI: Add new function to unmap IO resources Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` [PATCH V9 04/11] ACPI/PCI: Support IO resources when parsing PCI host bridge resources Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` [PATCH V9 05/11] ACPI/PCI: Add generic MCFG table handling Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 23:25 ` Bjorn Helgaas 2016-06-10 23:25 ` Bjorn Helgaas 2016-06-10 19:55 ` [PATCH V9 06/11] PCI: Refactor generic bus domain assignment Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 20:50 ` Lorenzo Pieralisi 2016-06-10 20:50 ` Lorenzo Pieralisi 2016-06-10 19:55 ` [PATCH V9 07/11] PCI: Factor DT specific pci_bus_find_domain_nr() code out Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 20:51 ` Lorenzo Pieralisi 2016-06-10 20:51 ` Lorenzo Pieralisi 2016-06-10 19:55 ` [PATCH V9 08/11] ARM64/PCI: Add ACPI hook to assign domain number Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki [this message] 2016-06-10 19:55 ` [PATCH V9 09/11] ARM64/PCI: ACPI support for legacy IRQs parsing and consolidation with DT code Tomasz Nowicki 2016-06-10 23:36 ` Bjorn Helgaas 2016-06-10 23:36 ` Bjorn Helgaas 2016-06-13 10:00 ` Tomasz Nowicki 2016-06-13 10:00 ` Tomasz Nowicki 2016-06-13 10:40 ` Lorenzo Pieralisi 2016-06-13 10:40 ` Lorenzo Pieralisi 2016-06-13 15:56 ` Liviu.Dudau 2016-06-13 15:56 ` Liviu.Dudau at arm.com 2016-06-13 20:01 ` Duc Dang 2016-07-05 4:36 ` Duc Dang 2016-06-13 20:01 ` Duc Dang 2016-06-14 9:30 ` Lorenzo Pieralisi 2016-06-14 9:30 ` Lorenzo Pieralisi 2016-06-14 9:30 ` Lorenzo Pieralisi 2016-06-10 19:55 ` [PATCH V9 10/11] ARM64/PCI: Implement ACPI low-level calls to access PCI_Config region from AML Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-06-10 20:54 ` Lorenzo Pieralisi 2016-06-10 20:54 ` Lorenzo Pieralisi 2016-06-10 19:55 ` [PATCH V9 11/11] ARM64/PCI: Support for ACPI based PCI host controller Tomasz Nowicki 2016-06-10 19:55 ` Tomasz Nowicki 2016-11-22 23:13 ` Bjorn Helgaas 2016-11-22 23:13 ` Bjorn Helgaas 2016-11-22 23:13 ` Bjorn Helgaas 2016-11-23 11:21 ` Tomasz Nowicki 2016-11-23 11:21 ` Tomasz Nowicki 2016-11-23 18:22 ` Bjorn Helgaas 2016-11-23 18:22 ` Bjorn Helgaas 2016-11-24 11:10 ` Tomasz Nowicki 2016-11-24 11:10 ` Tomasz Nowicki 2016-06-10 23:41 ` [PATCH V9 00/11] Support for ARM64 " Bjorn Helgaas 2016-06-10 23:41 ` Bjorn Helgaas 2016-06-10 23:50 ` Jon Masters 2016-06-10 23:50 ` Jon Masters 2016-06-10 23:50 ` Jon Masters 2016-06-10 23:58 ` [Linaro-acpi] " Jon Masters 2016-06-10 23:58 ` Jon Masters 2016-06-11 9:51 ` Tomasz Nowicki 2016-06-11 9:51 ` Tomasz Nowicki
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465588519-11334-10-git-send-email-tn@semihalf.com \ --to=tn@semihalf.com \ --cc=Liviu.Dudau@arm.com \ --cc=Lorenzo.Pieralisi@arm.com \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=andrea.gallo@linaro.org \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=cov@codeaurora.org \ --cc=ddaney@caviumnetworks.com \ --cc=dhdang@apm.com \ --cc=hanjun.guo@linaro.org \ --cc=helgaas@kernel.org \ --cc=jchandra@broadcom.com \ --cc=jcm@redhat.com \ --cc=jeremy.linton@arm.com \ --cc=linaro-acpi@lists.linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=liudongdong3@huawei.com \ --cc=msalter@redhat.com \ --cc=mw@semihalf.com \ --cc=okaya@codeaurora.org \ --cc=rafael@kernel.org \ --cc=robert.richter@caviumnetworks.com \ --cc=wangyijing@huawei.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.