Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc279850 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_dev 



These interfaces:

  pcibios_resource_to_bus(struct pci_dev *dev, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_dev *dev, *resource, *bus_region)

took a pci_dev, but they really depend only on the pci_bus.  And we want to
use them in resource allocation paths where we have the bus but not a
device, so this patch converts them to take the pci_bus instead of the
pci_dev:

  pcibios_resource_to_bus(struct pci_bus *bus, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_bus *bus, *resource, *bus_region)

In fact, with standard PCI-PCI bridges, they only depend on the host
bridge, because that's the only place address translation occurs, but
we aren't going that far yet.

[bhelgaas: changelog]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 0a5ef7b9

arch/alpha/kernel/pci-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int pci_mmap_resource(struct kobject *kobj, 
	if (iomem_is_exclusive(res->start))

		return -EINVAL;



	pcibios_resource_to_bus(pdev, &bar, res);

	pcibios_resource_to_bus(pdev->bus, &bar, res);

	vma->vm_pgoff += bar.start >> (PAGE_SHIFT - (sparse ? 5 : 0));

	mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
@@ -139,7 +139,7 @@ static int sparse_mem_mmap_fits(struct pci_dev *pdev, int num) 
	long dense_offset;

	unsigned long sparse_size;



	pcibios_resource_to_bus(pdev, &bar, &pdev->resource[num]);

	pcibios_resource_to_bus(pdev->bus, &bar, &pdev->resource[num]);



	/* All core logic chips have 4G sparse address space, except

	   CIA which has 16G (see xxx_SPARSE_MEM and xxx_DENSE_MEM

arch/powerpc/kernel/pci-common.c

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static void pcibios_fixup_resources(struct pci_dev *dev) 
		 * at 0 as unset as well, except if PCI_PROBE_ONLY is also set

		 * since in that case, we don't want to re-assign anything

		 */

		pcibios_resource_to_bus(dev, &reg, res);

		pcibios_resource_to_bus(dev->bus, &reg, res);

		if (pci_has_flag(PCI_REASSIGN_ALL_RSRC) ||

		    (reg.start == 0 && !pci_has_flag(PCI_PROBE_ONLY))) {

			/* Only print message if not re-assigning */
@@ -886,7 +886,7 @@ static int pcibios_uninitialized_bridge_resource(struct pci_bus *bus, 


	/* Job is a bit different between memory and IO */

	if (res->flags & IORESOURCE_MEM) {

		pcibios_resource_to_bus(dev, &region, res);

		pcibios_resource_to_bus(dev->bus, &region, res);



		/* If the BAR is non-0 then it's probably been initialized */

		if (region.start != 0)

arch/powerpc/kernel/pci_of_scan.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
		res->name = pci_name(dev);

		region.start = base;

		region.end = base + size - 1;

		pcibios_bus_to_resource(dev, res, &region);

		pcibios_bus_to_resource(dev->bus, res, &region);

	}

}
@@ -280,7 +280,7 @@ void of_scan_pci_bridge(struct pci_dev *dev) 
		res->flags = flags;

		region.start = of_read_number(&ranges[1], 2);

		region.end = region.start + size - 1;

		pcibios_bus_to_resource(dev, res, &region);

		pcibios_bus_to_resource(dev->bus, res, &region);

	}

	sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),

		bus->number);

arch/sparc/kernel/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void apb_fake_ranges(struct pci_dev *dev, 
	res->flags = IORESOURCE_IO;

	region.start = (first << 21);

	region.end = (last << 21) + ((1 << 21) - 1);

	pcibios_bus_to_resource(dev, res, &region);

	pcibios_bus_to_resource(dev->bus, res, &region);



	pci_read_config_byte(dev, APB_MEM_ADDRESS_MAP, &map);

	apb_calc_first_last(map, &first, &last);
@@ -400,7 +400,7 @@ static void apb_fake_ranges(struct pci_dev *dev, 
	res->flags = IORESOURCE_MEM;

	region.start = (first << 29);

	region.end = (last << 29) + ((1 << 29) - 1);

	pcibios_bus_to_resource(dev, res, &region);

	pcibios_bus_to_resource(dev->bus, res, &region);

}



static void pci_of_scan_bus(struct pci_pbm_info *pbm,
@@ -491,7 +491,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, 
		res->flags = flags;

		region.start = GET_64BIT(ranges, 1);

		region.end = region.start + size - 1;

		pcibios_bus_to_resource(dev, res, &region);

		pcibios_bus_to_resource(dev->bus, res, &region);

	}

after_ranges:

	sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),

drivers/pci/host-bridge.c

+8 −11
Original line number Diff line number Diff line
@@ -9,22 +9,19 @@ 


#include "pci.h"



static struct pci_bus *find_pci_root_bus(struct pci_dev *dev)

static struct pci_bus *find_pci_root_bus(struct pci_bus *bus)

{

	struct pci_bus *bus;



	bus = dev->bus;

	while (bus->parent)

		bus = bus->parent;



	return bus;

}



static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev)

static struct pci_host_bridge *find_pci_host_bridge(struct pci_bus *bus)

{

	struct pci_bus *bus = find_pci_root_bus(dev);

	struct pci_bus *root_bus = find_pci_root_bus(bus);



	return to_pci_host_bridge(bus->bridge);

	return to_pci_host_bridge(root_bus->bridge);

}



void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
@@ -40,10 +37,10 @@ static bool resource_contains(struct resource *res1, struct resource *res2) 
	return res1->start <= res2->start && res1->end >= res2->end;

}



void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,

			     struct resource *res)

{

	struct pci_host_bridge *bridge = find_pci_host_bridge(dev);

	struct pci_host_bridge *bridge = find_pci_host_bridge(bus);

	struct pci_host_bridge_window *window;

	resource_size_t offset = 0;
@@ -68,10 +65,10 @@ static bool region_contains(struct pci_bus_region *region1, 
	return region1->start <= region2->start && region1->end >= region2->end;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,

			     struct pci_bus_region *region)

{

	struct pci_host_bridge *bridge = find_pci_host_bridge(dev);

	struct pci_host_bridge *bridge = find_pci_host_bridge(bus);

	struct pci_host_bridge_window *window;

	resource_size_t offset = 0;