From patchwork Fri Jun 10 19:55:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9170329 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 E37916048F for ; Fri, 10 Jun 2016 19:56:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D457D26E5D for ; Fri, 10 Jun 2016 19:56:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C90AE282F9; Fri, 10 Jun 2016 19:56:07 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 D520028325 for ; Fri, 10 Jun 2016 19:56:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752733AbcFJTzy (ORCPT ); Fri, 10 Jun 2016 15:55:54 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:35579 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbcFJTzw (ORCPT ); Fri, 10 Jun 2016 15:55:52 -0400 Received: by mail-lf0-f45.google.com with SMTP id u74so52306589lff.2 for ; Fri, 10 Jun 2016 12:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o6L4OflEQjzr6EkgdqNlMComFUzsoRkZXcNiP/dKnkw=; b=kfr7hByogMHB1C6nnvH/7h0IoKqQ+7gfMeVXe5pbg/+3m0wE8Xtzd0jjbhES+NHbiA kRjxqaqy+XCza8jXoocq2axGSPE9c6dr08CT6tMqqQmCho2+aBQDccGuyxtfs30Nuzqp Fmbd1PTn0jNj+9AeSV5Ill3sKNu7XBD8zxyGbygP4cmRE3NjXbO1ent0EOyRWZatyUlO hO3rWFaLCXHxBxkpxqj90enIeGrOopCQIGoObDJ8XdFI4VULlddzPlAWFr9NuNZs6SLE hE9QNsQcbYt/qUJ81HanlmcxsNwXy5/eMwawkbcqS+q5ii6HBexgtGTht19T/p1cvAB5 frUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o6L4OflEQjzr6EkgdqNlMComFUzsoRkZXcNiP/dKnkw=; b=UVf3Ol7/hbNjXy1tNBbJvxkmS9GgjLBMnovq8jJgvI88pq4SyBea/mWw374Yq7g0IY rAmCsECbJanvH97x9XcUlnGllZLpeEaPjnzIcjPWE5g2lkgoXM9b5W6za83v1S81oPy7 TeHvmly5Ou0SyfmXut12aJW/894dY3yIjCdpizJQtrjOWxbuAxo/+0GjsZMlaV/sbYUN B6g/7JigJMfXQCHOtkHsEI+N6ula8XuocVNyMosKoZBL+dVvOhdW1fHNY2m8or+CJiVt BVtfC6MrV/J+lLXQOhnNzAjP+mdirNs//pTFUZi5BZU/bB8wIUQU1SLIDstAavRoFo6C aGOg== X-Gm-Message-State: ALyK8tJtWX5HoLz7CcYlUhZwc4eQxDEFZEMYYD+yBHCnXB7aZu6upCWcNXrrTITsHLOXNA== X-Received: by 10.25.23.72 with SMTP id n69mr1203279lfi.64.1465588550439; Fri, 10 Jun 2016 12:55:50 -0700 (PDT) Received: from tn-HP-4.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id a190sm1377175lfe.21.2016.06.10.12.55.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Jun 2016 12:55:49 -0700 (PDT) From: Tomasz Nowicki 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 Subject: [PATCH V9 04/11] ACPI/PCI: Support IO resources when parsing PCI host bridge resources Date: Fri, 10 Jun 2016 21:55:12 +0200 Message-Id: <1465588519-11334-5-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465588519-11334-1-git-send-email-tn@semihalf.com> References: <1465588519-11334-1-git-send-email-tn@semihalf.com> 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 From: Jayachandran C 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 unmap I/O resources with pci_unmap_iospace() when we release host bridge resources. Signed-off-by: Jayachandran C Signed-off-by: Sinan Kaya [ Tomasz: merged in Sinan's patch to unmap IO resources properly, updated changelog] Signed-off-by: Tomasz Nowicki Reviewed-by: Lorenzo Pieralisi --- 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..9a26dd1 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 inline 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);