From patchwork Mon Feb 19 17:48:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 128823 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3718381ljc; Mon, 19 Feb 2018 08:57:17 -0800 (PST) X-Google-Smtp-Source: AH8x224eyS7MimH4IEXEL9QkGvKF2+B2mGlB31z42iQy/BPrEUIenMWw9QnuI8CQuUpnh9+HkEJ4 X-Received: by 2002:a17:902:1486:: with SMTP id k6-v6mr15208673pla.376.1519059437666; Mon, 19 Feb 2018 08:57:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519059437; cv=none; d=google.com; s=arc-20160816; b=mQZVsMTCF33y/dITPqu0/BV5d9DYw58iXCjsNs5iORGNZRLQbJWwF546uX7P3sdJcG 9IUSH4rVXWYE5koQJ1YfL6ipU7AOGDAlS+bB14fd8wQYu7udPDPBShcEVIJHiJ+HXRcb H0WQdqDY/sgamGk7hCFlkjg3D/AkfIdDi1OhnRQrJt5ArCVFzjMdDzJ6ysXWclGMkWli KXtQ3ap4qxQFNf/lJoJ9/O0fPUCmG4UB4lbjNHxQRy5q9sfCrUyI2XeaI9Aju+UVSk8W THL1VfS50PDKVODffgAurlUokYxI5Wg7Mmd/7QqDbhinf883na66l1xgL3hcwv1+w7zI BODQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=tQ43dbwlnWkoK7s7xFcicV0oEWk863/9t6f01/xBK6Q=; b=V+NhnUOyfHVH0GEHwYKjlAFIpasXHqCTEtdXNyW+87aelmBiFtvJfg94eVSNV47qRz PVbYyOvY5Dce2Ctup9TyjY85F3xOfXem2ralJmfhOX5bXXfxkI3r3jQkg6o9jCs51F3s 4V2794KYMckHo8woLDN00m0cX7FedcdMWTgiIWaDOFot1DSbJqfXoXpsE8TOXBH1PJZd BmBkkolV8uoq0AgoJw/QpjvLH7Zbw+bSZ8zpRzPXqbMAHhU82QvTDBLUeBWHE8hHKzAh UlVYQXIXoGNCh8hoKLnwGKRaYWKrfQU1ftt45jxxzRkZCve9tQ+641Givv6ZFuzCisSQ VuvA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y38-v6si4463430plh.448.2018.02.19.08.57.17; Mon, 19 Feb 2018 08:57:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753399AbeBSQ5M (ORCPT + 28 others); Mon, 19 Feb 2018 11:57:12 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:45760 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753300AbeBSQ5G (ORCPT ); Mon, 19 Feb 2018 11:57:06 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 522E1A8F77006; Tue, 20 Feb 2018 00:56:48 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.361.1; Tue, 20 Feb 2018 00:56:40 +0800 From: John Garry To: , , , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v14 3/9] PCI: Add fwnode handler as input param of pci_register_io_range() Date: Tue, 20 Feb 2018 01:48:34 +0800 Message-ID: <1519062520-198902-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519062520-198902-1-git-send-email-john.garry@huawei.com> References: <1519062520-198902-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriele Paoloni In preparation for having the PCI MMIO helpers to use the new generic I/O space management(logical PIO) we need to add the fwnode handler as extra input parameter. This patch changes the signature of pci_register_io_range() and of its callers as needed. Signed-off-by: Gabriele Paoloni Acked-by: Bjorn Helgaas Acked-by: Rob Herring --- drivers/acpi/pci_root.c | 8 +++++--- drivers/of/address.c | 4 +++- drivers/pci/pci.c | 3 ++- include/linux/pci.h | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 6fc204a..1213479 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -729,7 +729,8 @@ static void acpi_pci_root_validate_resources(struct device *dev, } } -static void acpi_pci_root_remap_iospace(struct resource_entry *entry) +static void acpi_pci_root_remap_iospace(struct fwnode_handle *fwnode, + struct resource_entry *entry) { #ifdef PCI_IOBASE struct resource *res = entry->res; @@ -738,7 +739,7 @@ static void acpi_pci_root_remap_iospace(struct resource_entry *entry) resource_size_t length = resource_size(res); unsigned long port; - if (pci_register_io_range(cpu_addr, length)) + if (pci_register_io_range(fwnode, cpu_addr, length)) goto err; port = pci_address_to_pio(cpu_addr); @@ -780,7 +781,8 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) else { resource_list_for_each_entry_safe(entry, tmp, list) { if (entry->res->flags & IORESOURCE_IO) - acpi_pci_root_remap_iospace(entry); + acpi_pci_root_remap_iospace(&device->fwnode, + entry); if (entry->res->flags & IORESOURCE_DISABLED) resource_list_destroy_entry(entry); diff --git a/drivers/of/address.c b/drivers/of/address.c index ce4d3d8..cdf047b 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -2,6 +2,7 @@ #define pr_fmt(fmt) "OF: " fmt #include +#include #include #include #include @@ -333,7 +334,8 @@ int of_pci_range_to_resource(struct of_pci_range *range, if (res->flags & IORESOURCE_IO) { unsigned long port; - err = pci_register_io_range(range->cpu_addr, range->size); + err = pci_register_io_range(&np->fwnode, range->cpu_addr, + range->size); if (err) goto invalid_range; port = pci_address_to_pio(range->cpu_addr); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4666a01..07290a3 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3455,7 +3455,8 @@ struct io_range { * Record the PCI IO range (expressed as CPU physical address + size). * Return a negative value if an error has occured, zero otherwise */ -int pci_register_io_range(phys_addr_t addr, resource_size_t size) +int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, + resource_size_t size) { int err = 0; diff --git a/include/linux/pci.h b/include/linux/pci.h index 25b7a35..17cc998 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1221,7 +1221,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus, void *alignf_data); -int pci_register_io_range(phys_addr_t addr, resource_size_t size); +int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, + resource_size_t size); unsigned long pci_address_to_pio(phys_addr_t addr); phys_addr_t pci_pio_to_address(unsigned long pio); int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);