From patchwork Thu Dec 24 11:57:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jayachandran C." X-Patchwork-Id: 7917401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6CC099F32E for ; Thu, 24 Dec 2015 11:56:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 830C420461 for ; Thu, 24 Dec 2015 11:56:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2CE120458 for ; Thu, 24 Dec 2015 11:56:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aC4Tl-0006ru-Q9; Thu, 24 Dec 2015 11:54:45 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aC4Tj-0006rT-DH for linux-arm-kernel@bombadil.infradead.org; Thu, 24 Dec 2015 11:54:43 +0000 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]) by merlin.infradead.org with esmtp (Exim 4.85 #2 (Red Hat Linux)) id 1aC4Av-00058g-0O for linux-arm-kernel@lists.infradead.org; Thu, 24 Dec 2015 11:35:17 +0000 X-IronPort-AV: E=Sophos;i="5.20,473,1444719600"; d="scan'208";a="83965693" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw3-out.broadcom.com with ESMTP; 24 Dec 2015 04:10:43 -0800 Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.235.1; Thu, 24 Dec 2015 03:34:55 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.3.235.1; Thu, 24 Dec 2015 03:34:55 -0800 Received: from netl-snoppy.ban.broadcom.com (unknown [10.132.128.129]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 8B46D40FE6; Thu, 24 Dec 2015 03:31:18 -0800 (PST) From: Jayachandran C To: , Bjorn Helgaas , , Arnd Bergmann , , "Rafael J. Wysocki" Subject: [PATCH v4 3/5] ACPI: PCI: Support platforms that need pci_remap_iospace Date: Thu, 24 Dec 2015 17:27:30 +0530 Message-ID: <1450958252-29892-4-git-send-email-jchandra@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450958252-29892-1-git-send-email-jchandra@broadcom.com> References: <1450958252-29892-1-git-send-email-jchandra@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151224_063517_251099_73F1E75B X-CRM114-Status: GOOD ( 15.09 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Nowicki , Lorenzo Pieralisi , Jayachandran C Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On some platforms (in this case ARM64), the PCI iospace needs to be mapped with pci_remap_iospace and the resources have to be adjusted for the iospace physical address. This has to be done before acpi_pci_root_validate_resources() checks and removes resource windows. Handle this by adding a function acpi_pci_root_remap_iospace that is called in acpi_pci_probe_root_resources(), before the validate call. Also fix the address check in acpi_dev_ioresource_flags for similar platforms. Signed-off-by: Jayachandran C --- drivers/acpi/pci_root.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++-- drivers/acpi/resource.c | 2 ++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..fcaa484 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -720,6 +720,61 @@ next: } } +#ifdef PCI_IOBASE +/* + * The IO ports are mapped to a memory range, fixup IO resources to + * handle that + */ +static int acpi_pci_root_remap_iospace(struct acpi_pci_root_info *ci) +{ + struct resource_entry *entry; + struct resource iores; + resource_size_t iostart; + int err; + + iores.flags = IORESOURCE_IO; + iores.start = (resource_size_t)-1; + iores.end = 0; + resource_list_for_each_entry(entry, &ci->resources) { + if (entry->res->flags & IORESOURCE_IO) { + iores.start = min(entry->res->start, iores.start); + iores.end = max(entry->res->end, iores.end); + } + } + if (iores.end == 0) + return 0; + iostart = iores.start; + + resource_list_for_each_entry(entry, &ci->resources) { + if (entry->res->flags & IORESOURCE_IO) { + entry->res->start -= iostart; + entry->res->end -= iostart; + entry->offset -= iostart; + } + } + iores.start -= iostart; + iores.end -= iostart; + + err = pci_remap_iospace(&iores, iostart); + if (err) { + pr_err("PCI: ACPI: err %d mapping IO %pR\n", err, &iores); + return -ENODEV; + } + pr_info(PREFIX "Mapped %pR at %#lx for IO.\n", + &iores, (unsigned long)iostart); + return 0; +} +#else +/* + * The IO ports are mapped to a memory range, fixup IO resources to + * handle that + */ +static int acpi_pci_root_remap_iospace(struct acpi_pci_root_info *ci) +{ + return 0; +} +#endif /* PCI_IOBASE */ + int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) { int ret; @@ -745,10 +800,13 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) else entry->res->name = info->name; } - acpi_pci_root_validate_resources(&device->dev, list, + ret = acpi_pci_root_remap_iospace(info); + if (ret >= 0) { + acpi_pci_root_validate_resources(&device->dev, list, IORESOURCE_MEM); - acpi_pci_root_validate_resources(&device->dev, list, + acpi_pci_root_validate_resources(&device->dev, list, IORESOURCE_IO); + } } return ret; diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index cdc5c25..530cad4 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -126,8 +126,10 @@ static void acpi_dev_ioresource_flags(struct resource *res, u64 len, if (!acpi_dev_resource_len_valid(res->start, res->end, len, true)) res->flags |= IORESOURCE_DISABLED | IORESOURCE_UNSET; +#ifndef PCI_IOBASE if (res->end >= 0x10003) res->flags |= IORESOURCE_DISABLED | IORESOURCE_UNSET; +#endif if (io_decode == ACPI_DECODE_16) res->flags |= IORESOURCE_IO_16BIT_ADDR;