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 V8 4/9] acpi, pci: Support IO resources when parsing PCI host bridge resources. Date: Mon, 30 May 2016 17:14:17 +0200 [thread overview] Message-ID: <1464621262-26770-5-git-send-email-tn@semihalf.com> (raw) In-Reply-To: <1464621262-26770-1-git-send-email-tn@semihalf.com> Platforms that have memory mapped IO port (such as ARM64) need special handling for PCI I/O resources. For host bridge's resource probing case these resources need to be fixed up with pci_register_io_range/pci_remap_iospace etc. The same I/O resources need to be released after hotplug removal so that it can be re-added back by the pci_remap_iospace function during insertion. As a consequence we unmap I/O resources with pci_unmap_iospace when we release host bridge resources. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Signed-off-by: Tomasz Nowicki <tn@semihalf.com> --- drivers/acpi/pci_root.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..ee3b728 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -720,6 +720,40 @@ next: } } +#ifdef PCI_IOBASE +static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +{ + struct resource *res = entry->res; + resource_size_t cpu_addr = res->start; + resource_size_t pci_addr = cpu_addr - entry->offset; + resource_size_t length = resource_size(res); + unsigned long port; + + if (pci_register_io_range(cpu_addr, length)) + goto err; + + port = pci_address_to_pio(cpu_addr); + if (port == (unsigned long)-1) + goto err; + + res->start = port; + res->end = port + length - 1; + entry->offset = port - pci_addr; + + if (pci_remap_iospace(res, cpu_addr) < 0) + goto err; + + pr_info("Remapped I/O %pa to %pR\n", &cpu_addr, res); + return; +err: + res->flags |= IORESOURCE_DISABLED; +} +#else +static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +{ +} +#endif + int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) { int ret; @@ -740,6 +774,9 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) "no IO and memory resources present in _CRS\n"); else { resource_list_for_each_entry_safe(entry, tmp, list) { + if (entry->res->flags & IORESOURCE_IO) + acpi_pci_root_remap_iospace(entry); + if (entry->res->flags & IORESOURCE_DISABLED) resource_list_destroy_entry(entry); else @@ -811,6 +848,8 @@ static void acpi_pci_root_release_info(struct pci_host_bridge *bridge) resource_list_for_each_entry(entry, &bridge->windows) { res = entry->res; + if (res->flags & IORESOURCE_IO) + pci_unmap_iospace(res); if (res->parent && (res->flags & (IORESOURCE_MEM | IORESOURCE_IO))) release_resource(res); -- 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 V8 4/9] acpi, pci: Support IO resources when parsing PCI host bridge resources. Date: Mon, 30 May 2016 17:14:17 +0200 [thread overview] Message-ID: <1464621262-26770-5-git-send-email-tn@semihalf.com> (raw) In-Reply-To: <1464621262-26770-1-git-send-email-tn@semihalf.com> Platforms that have memory mapped IO port (such as ARM64) need special handling for PCI I/O resources. For host bridge's resource probing case these resources need to be fixed up with pci_register_io_range/pci_remap_iospace etc. The same I/O resources need to be released after hotplug removal so that it can be re-added back by the pci_remap_iospace function during insertion. As a consequence we unmap I/O resources with pci_unmap_iospace when we release host bridge resources. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Signed-off-by: Tomasz Nowicki <tn@semihalf.com> --- drivers/acpi/pci_root.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..ee3b728 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -720,6 +720,40 @@ next: } } +#ifdef PCI_IOBASE +static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +{ + struct resource *res = entry->res; + resource_size_t cpu_addr = res->start; + resource_size_t pci_addr = cpu_addr - entry->offset; + resource_size_t length = resource_size(res); + unsigned long port; + + if (pci_register_io_range(cpu_addr, length)) + goto err; + + port = pci_address_to_pio(cpu_addr); + if (port == (unsigned long)-1) + goto err; + + res->start = port; + res->end = port + length - 1; + entry->offset = port - pci_addr; + + if (pci_remap_iospace(res, cpu_addr) < 0) + goto err; + + pr_info("Remapped I/O %pa to %pR\n", &cpu_addr, res); + return; +err: + res->flags |= IORESOURCE_DISABLED; +} +#else +static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +{ +} +#endif + int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) { int ret; @@ -740,6 +774,9 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) "no IO and memory resources present in _CRS\n"); else { resource_list_for_each_entry_safe(entry, tmp, list) { + if (entry->res->flags & IORESOURCE_IO) + acpi_pci_root_remap_iospace(entry); + if (entry->res->flags & IORESOURCE_DISABLED) resource_list_destroy_entry(entry); else @@ -811,6 +848,8 @@ static void acpi_pci_root_release_info(struct pci_host_bridge *bridge) resource_list_for_each_entry(entry, &bridge->windows) { res = entry->res; + if (res->flags & IORESOURCE_IO) + pci_unmap_iospace(res); if (res->parent && (res->flags & (IORESOURCE_MEM | IORESOURCE_IO))) release_resource(res); -- 1.9.1
next prev parent reply other threads:[~2016-05-30 15:14 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-30 15:14 [PATCH V8 0/9] Support for ARM64 ACPI based PCI host controller Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` [PATCH V8 1/9] PCI: ecam: move ecam.h to linux/include/pci-ecam.h Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-02 9:48 ` Lorenzo Pieralisi 2016-06-02 9:48 ` Lorenzo Pieralisi 2016-05-30 15:14 ` [PATCH V8 2/9] PCI: ecam: Add parent device field to pci_config_window Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-02 10:13 ` Lorenzo Pieralisi 2016-06-02 10:13 ` Lorenzo Pieralisi 2016-05-30 15:14 ` [PATCH V8 3/9] pci: Add new function to unmap IO resources Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-02 16:50 ` Lorenzo Pieralisi 2016-06-02 16:50 ` Lorenzo Pieralisi 2016-05-30 15:14 ` Tomasz Nowicki [this message] 2016-05-30 15:14 ` [PATCH V8 4/9] acpi, pci: Support IO resources when parsing PCI host bridge resources Tomasz Nowicki 2016-06-02 17:30 ` Lorenzo Pieralisi 2016-06-02 17:30 ` Lorenzo Pieralisi 2016-06-07 23:56 ` Bjorn Helgaas 2016-06-07 23:56 ` Bjorn Helgaas 2016-06-07 23:56 ` Bjorn Helgaas 2016-05-30 15:14 ` [PATCH V8 5/9] pci, acpi: add acpi hook to assign domain number Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-08 0:15 ` Bjorn Helgaas 2016-06-08 0:15 ` Bjorn Helgaas 2016-06-08 0:15 ` Bjorn Helgaas 2016-06-08 10:21 ` Tomasz Nowicki 2016-06-08 10:21 ` Tomasz Nowicki 2016-06-08 13:22 ` Bjorn Helgaas 2016-06-08 13:22 ` Bjorn Helgaas 2016-06-08 13:22 ` Bjorn Helgaas 2016-06-10 15:14 ` Lorenzo Pieralisi 2016-06-10 15:14 ` Lorenzo Pieralisi 2016-06-10 15:49 ` Lorenzo Pieralisi 2016-06-10 15:49 ` Lorenzo Pieralisi 2016-06-10 16:49 ` Tomasz Nowicki 2016-06-10 16:49 ` Tomasz Nowicki 2016-06-10 18:18 ` Bjorn Helgaas 2016-06-10 18:18 ` Bjorn Helgaas 2016-06-10 18:54 ` Jon Masters 2016-06-10 18:54 ` Jon Masters 2016-06-10 18:54 ` Jon Masters 2016-05-30 15:14 ` [PATCH V8 6/9] arm64, pci, acpi: ACPI support for legacy IRQs parsing and consolidation with DT code Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:14 ` [PATCH V8 7/9] acpi: Add generic MCFG table handling Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-03 11:38 ` Lorenzo Pieralisi 2016-06-03 11:38 ` Lorenzo Pieralisi 2016-06-06 12:55 ` Tomasz Nowicki 2016-06-06 12:55 ` Tomasz Nowicki 2016-06-08 1:56 ` Bjorn Helgaas 2016-06-08 1:56 ` Bjorn Helgaas 2016-06-08 1:56 ` Bjorn Helgaas 2016-06-08 12:21 ` Tomasz Nowicki 2016-06-08 12:21 ` Tomasz Nowicki 2016-06-08 13:17 ` Bjorn Helgaas 2016-06-08 13:17 ` Bjorn Helgaas 2016-06-08 13:17 ` Bjorn Helgaas 2016-06-08 13:44 ` Tomasz Nowicki 2016-06-08 13:44 ` Tomasz Nowicki 2016-05-30 15:14 ` [PATCH V8 8/9] arm64, pci, acpi: Provide ACPI-specific prerequisites for PCI bus enumeration Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-06-02 9:45 ` Lorenzo Pieralisi 2016-06-02 9:45 ` Lorenzo Pieralisi 2016-06-02 9:51 ` Tomasz Nowicki 2016-06-02 9:51 ` Tomasz Nowicki 2016-05-30 15:14 ` [PATCH V8 9/9] pci, acpi: ARM64 support for ACPI based generic PCI host controller Tomasz Nowicki 2016-05-30 15:14 ` Tomasz Nowicki 2016-05-30 15:38 ` Arnd Bergmann 2016-05-30 15:38 ` Arnd Bergmann 2016-05-30 16:13 ` Jayachandran C 2016-05-30 16:13 ` Jayachandran C 2016-05-30 16:13 ` Jayachandran C 2016-06-02 9:35 ` Lorenzo Pieralisi 2016-06-02 9:35 ` Lorenzo Pieralisi 2016-06-02 9:44 ` Tomasz Nowicki 2016-06-02 9:44 ` Tomasz Nowicki 2016-06-08 2:14 ` Bjorn Helgaas 2016-06-08 2:14 ` Bjorn Helgaas 2016-06-08 2:14 ` Bjorn Helgaas 2016-06-01 7:36 ` [PATCH V8 0/9] Support for ARM64 ACPI based " Gabriele Paoloni 2016-06-01 7:36 ` Gabriele Paoloni 2016-06-01 7:36 ` Gabriele Paoloni 2016-06-01 7:36 ` Gabriele Paoloni 2016-06-02 7:31 ` Jon Masters 2016-06-02 7:31 ` Jon Masters 2016-06-02 7:31 ` Jon Masters 2016-06-02 8:53 ` [Linaro-acpi] " Martin Stadtler 2016-06-02 10:06 ` Gabriele Paoloni 2016-06-02 10:06 ` Gabriele Paoloni 2016-06-02 10:06 ` Gabriele Paoloni 2016-06-02 10:06 ` Gabriele Paoloni 2016-06-02 8:52 ` Tomasz Nowicki 2016-06-02 8:52 ` Tomasz Nowicki 2016-06-02 8:52 ` Tomasz Nowicki 2016-06-02 8:52 ` Tomasz Nowicki 2016-06-02 9:58 ` Gabriele Paoloni 2016-06-02 9:58 ` Gabriele Paoloni 2016-06-02 9:58 ` Gabriele Paoloni 2016-06-02 9:58 ` Gabriele Paoloni 2016-06-02 8:48 ` Jon Masters 2016-06-02 8:48 ` Jon Masters 2016-06-07 23:13 ` Bjorn Helgaas 2016-06-07 23:13 ` Bjorn Helgaas 2016-06-07 23:13 ` Bjorn Helgaas 2016-06-08 9:20 ` Dongdong Liu 2016-06-08 9:20 ` Dongdong Liu 2016-06-08 9:20 ` Dongdong Liu 2016-06-09 16:45 ` Suravee Suthikulanit 2016-06-09 16:45 ` Suravee Suthikulanit 2016-06-09 16:45 ` Suravee Suthikulanit 2016-06-09 16:45 ` Suravee Suthikulanit
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=1464621262-26770-5-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.