Commit fcfaab30 authored by Gabriele Paoloni's avatar Gabriele Paoloni Committed by Bjorn Helgaas
Browse files

PCI: Add fwnode handler as input param of pci_register_io_range() 



In preparation for having the PCI MMIO helpers use the new generic I/O
space management (logical PIO) we need to add the fwnode handler as an
extra input parameter.

Changes the signature of pci_register_io_range() and its callers as
needed.

Tested-by: default avatardann frazier <dann.frazier@canonical.com>
Signed-off-by: default avatarGabriele Paoloni <gabriele.paoloni@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
parent e2515476

drivers/acpi/pci_root.c

+5 −3
Original line number Diff line number Diff line
@@ -729,7 +729,8 @@ next: 
	}

}



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);

drivers/of/address.c

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define pr_fmt(fmt)	"OF: " fmt



#include <linux/device.h>

#include <linux/fwnode.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/module.h>
@@ -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);

drivers/pci/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -3455,7 +3455,8 @@ static DEFINE_SPINLOCK(io_range_lock); 
 * 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;

include/linux/pci.h

+2 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE