From patchwork Mon Feb 26 16:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 129694 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3975711edc; Mon, 26 Feb 2018 07:52:23 -0800 (PST) X-Google-Smtp-Source: AH8x2247Lfk8C7z9i1VWo/Li/wIeSIFsG3w0eA8pwdfYs/JBDPNak7zOgszER2Git9CYY7fP2Avt X-Received: by 10.98.93.87 with SMTP id r84mr11017170pfb.131.1519660342968; Mon, 26 Feb 2018 07:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519660342; cv=none; d=google.com; s=arc-20160816; b=BGg0HVkyReXr8qaXkbLlcy/UHAHTcVxXxw268d/hOqu74ToAXNjF6DC4UxQPNn96Be LGcuh/bpNBEDHbr933z3Opghq0bgPaI733Gqn+TZdeaHKh+mrC0OHuAwhzKQ7qWMJrGv 8SA/f8y9ihoGNpBLl3/f4tkp/zwMQ4pmpexkwgLPszU4RlqP9yY7bQ/pDv+x++35nEN1 mxpYt9dV+h7hKKsRMHNqwGiFD1/ZqPSRTt7NydyxdQz+VZ+8l/mK2HnhnbHGzXF+fk66 CIRn7pQRVYpoeg7zE6j5tGxR04KIn3q5nKXaNyp8qjp/Trbdt8DnPCllEEOD3JXSUMgX li4g== 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=ppJcILvgppFjd8Cc8fpNhrmVgJkSnG6DpVJ9RknLtEk=; b=yEsWMEauU5llCfjwDm3fc1mkW1eov4PJi8q0JBTdEF44yKlwJQjTof90wevTC6lTPa pkTCb8Lmc/t91Whr3Vns9Uags9ozsyYaTOeuvsVSKxgfLtaaUNOtvwiBFTXygF28+b3b xE8r9s63GbJfh5cCLROQ+kco9d6m5rKvFSsioqJ7EFdjnH3GmBZxvMoXr+NjZFa/Ok8Q Q33Q7S9RfQqD6AiFGFrrDyIKGHqjd0ds3pDlONzhvU2VIxL5IGw8sFBM6VsMAhp+H9rK 9ZQAqMEfZd156OtxpN6mlrWqgfwoBd5vroZ91BrrW64R53KTmJ35aXBC7scSq8M2qnIa Esdw== 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 d12si5643008pgq.734.2018.02.26.07.52.22; Mon, 26 Feb 2018 07:52:22 -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 S1752441AbeBZPwU (ORCPT + 28 others); Mon, 26 Feb 2018 10:52:20 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:49679 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752079AbeBZPuU (ORCPT ); Mon, 26 Feb 2018 10:50:20 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id E4B0CD3604B49; Mon, 26 Feb 2018 23:50:06 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.361.1; Mon, 26 Feb 2018 23:49:58 +0800 From: John Garry To: , , , , , , , , , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v15 3/9] PCI: Add fwnode handler as input param of pci_register_io_range() Date: Tue, 27 Feb 2018 00:40:43 +0800 Message-ID: <1519663249-9850-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519663249-9850-1-git-send-email-john.garry@huawei.com> References: <1519663249-9850-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 Reviewed-by: Andy Shevchenko Tested-by: dann frazier --- 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);