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 V7 05/11] acpi, pci: Support IO resources when parsing PCI host bridge resources.
Date: Tue, 10 May 2016 17:19:55 +0200 [thread overview]
Message-ID: <1462893601-8937-6-git-send-email-tn@semihalf.com> (raw)
In-Reply-To: <1462893601-8937-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 | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ae3fe4e..cb3071d 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -719,6 +719,34 @@ next:
resource_list_add_tail(entry, resources);
}
}
+static void acpi_pci_root_remap_iospace(struct resource_entry *entry)
+{
+#ifdef PCI_IOBASE
+ 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;
+#endif
+}
int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info)
{
@@ -740,6 +768,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 +842,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-10 15:20 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 15:19 [PATCH V7 00/11] Support for generic ACPI based PCI host controller Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 01/11] PCI: Provide common functions for ECAM mapping Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 02/11] PCI: generic, thunder: update to use generic ECAM API Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 03/11] pci, of: Move the PCI I/O space management to PCI core code Tomasz Nowicki
2016-05-10 17:59 ` Rafael J. Wysocki
2016-05-11 7:36 ` Tomasz Nowicki
2016-05-11 11:01 ` Arnd Bergmann
2016-05-10 15:19 ` [PATCH V7 04/11] pci: Add new function to unmap IO resources Tomasz Nowicki
2016-05-23 8:28 ` Jayachandran C
2016-05-10 15:19 ` Tomasz Nowicki [this message]
2016-05-10 18:20 ` [PATCH V7 05/11] acpi, pci: Support IO resources when parsing PCI host bridge resources Rafael J. Wysocki
2016-05-11 7:39 ` Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 06/11] pci, acpi: Provide a way to assign bus domain number Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment Tomasz Nowicki
2016-05-10 18:37 ` Rafael J. Wysocki
2016-05-10 18:43 ` Rafael J. Wysocki
2016-05-11 10:11 ` Lorenzo Pieralisi
2016-05-11 20:30 ` Rafael J. Wysocki
2016-05-11 22:43 ` Bjorn Helgaas
2016-05-12 10:01 ` Lorenzo Pieralisi
2016-05-12 10:43 ` Jayachandran C
2016-05-12 11:27 ` Rafael J. Wysocki
2016-05-13 10:32 ` Lorenzo Pieralisi
2016-05-12 10:50 ` Tomasz Nowicki
2016-05-12 12:08 ` Bjorn Helgaas
2016-05-17 3:11 ` Dongdong Liu
2016-05-17 13:44 ` Tomasz Nowicki
2016-05-10 15:19 ` [PATCH V7 08/11] pci, acpi: Support for ACPI based generic PCI host controller Tomasz Nowicki
2016-05-10 17:54 ` Rafael J. Wysocki
2016-05-10 18:18 ` Rafael J. Wysocki
2016-05-13 11:25 ` Jayachandran C
2016-05-13 11:31 ` Rafael J. Wysocki
2016-05-13 11:42 ` Tomasz Nowicki
2016-05-14 9:07 ` Jayachandran C
2016-05-23 11:34 ` Tomasz Nowicki
2016-05-19 16:56 ` Matthias Brugger
2016-05-10 15:19 ` [PATCH V7 09/11] arm64, pci, acpi: ACPI support for legacy IRQs parsing and consolidation with DT code Tomasz Nowicki
2016-05-10 15:20 ` [PATCH V7 10/11] arm64, pci, acpi: Provide ACPI-specific prerequisites for PCI bus enumeration Tomasz Nowicki
2016-05-10 15:20 ` [PATCH V7 11/11] arm64, pci, acpi: Start using ACPI based PCI host controller driver for ARM64 Tomasz Nowicki
2016-05-11 10:41 ` [PATCH V7 00/11] Support for generic ACPI based PCI host controller Gabriele Paoloni
2016-05-11 11:08 ` Tomasz Nowicki
2016-05-11 12:53 ` Gabriele Paoloni
2016-05-20 4:41 ` Jon Masters
2016-05-20 7:37 ` Ard Biesheuvel
2016-05-20 8:01 ` Jon Masters
2016-05-20 8:28 ` Ard Biesheuvel
2016-05-20 8:40 ` Gabriele Paoloni
2016-05-20 9:14 ` Ard Biesheuvel
2016-05-23 10:56 ` Lorenzo Pieralisi
2016-05-23 15:16 ` Gabriele Paoloni
2016-05-23 23:39 ` Bjorn Helgaas
2016-05-24 1:11 ` Jon Masters
2016-05-24 1:48 ` Jon Masters
2016-05-24 14:33 ` Gabriele Paoloni
2016-05-24 7:23 ` Gabriele Paoloni
2016-05-24 14:38 ` Jon Masters
2016-05-24 17:24 ` Lorenzo Pieralisi
2016-05-24 17:35 ` Jon Masters
2016-05-24 19:00 ` Bjorn Helgaas
2016-05-26 9:58 ` Gabriele Paoloni
2016-05-25 6:31 ` Gabriele Paoloni
2016-05-24 4:20 ` Jon Masters
2016-05-20 8:11 ` Gabriele Paoloni
2016-05-20 8:24 ` Jon Masters
2016-05-13 2:55 ` Duc Dang
2016-05-19 18:18 ` Jeremy Linton
2016-05-20 7:46 ` Jon Masters
2016-05-23 11:25 ` Dongdong Liu
2016-05-23 15:36 ` Sinan Kaya
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=1462893601-8937-6-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).