From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvdpRwWXE8sfLH60PrLhR15cXnG3d/PvN29UmHlxXJ6tLo952aBk+DBzG0ySHk8L054Wgf0 ARC-Seal: i=1; a=rsa-sha256; t=1521051423; cv=none; d=google.com; s=arc-20160816; b=hjDoZA89vCXp6U9JkxkXrz4K8G4muW59+9iXWLwY77f/pDzUYPUPeaWrRYq5LSrQTU uoTyPirv/AsxJeY4hqwon8okhx5NTQD8/KJCtTXJyrfbmfhAOFiMzYkASHwVAcXKDA4+ hiOcofaYO8MNFJ/RunTqoH8iaES9j9mdaH+bAetZ+vqRlbAM/MnTrfxLrGODSnp77Lqp O2C0UfYzZSbN8lzF8394x3WlQfDC/mcuSJe28GEysWHbpYmf4Yf+Zux0is8/VwxHCTrJ XepByJR01TehAZksshHElH3YWoe8LM1kTLEN3b3K/FIQNtQPO0s8jtvfZqBSN6yOJTy8 FFow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-authentication-results; bh=OA7cjhpliCNDOhxGQb5JT1Tyzni2iDNL/x3EBcw9IO4=; b=kbpbZuaZQDIQCk4xoO02JWrTnT5zPVfxqASLhLgmhZ/yw6JNZRMNPLGzqysazeBiRo Rr0RCkplceXxpT93kzwrhKmRzZWYjEmYIykKrQ++iLqfBTblS5Q0Ji/VH/lL6x93lqHo x1Ku5IzpZazctWx67L69Sj9GhqpNnLdS64z3YWgci/cyRDY6heQoU8JW71oLcSJDQpAF Mv857quLk+d+ei5k01EzRbEuUuAFyiFeB6p4P3to97NmJ9sDx34XuWnnnekYf8v3a2+D B0nqteH1RsUWGLRk49aTbkhCsQ+cd0dSX5cIABvegZT8b10TyYb5kLO2A8pI2tHdhDVW +JRw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of john.garry@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=john.garry@huawei.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of john.garry@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=john.garry@huawei.com From: John Garry To: , , , , , , , , , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v17 03/10] PCI: Add fwnode handler as input param of pci_register_io_range() Date: Thu, 15 Mar 2018 02:15:52 +0800 Message-ID: <1521051359-34473-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521051359-34473-1-git-send-email-john.garry@huawei.com> References: <1521051359-34473-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594938018073701750?= X-GMAIL-MSGID: =?utf-8?q?1594938018073701750?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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(-) 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 ff41a64..3f30b7d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3451,7 +3451,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); -- 1.9.1