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

Commit 14d76b68 authored by Jiang Liu's avatar Jiang Liu Committed by Rafael J. Wysocki
Browse files

PCI: Use common resource list management code instead of private implementation 



Use common resource list management data structure and interfaces
instead of private implementation.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 90e97820

arch/arm/kernel/bios32.c

+2 −3
Original line number Diff line number Diff line
@@ -422,17 +422,16 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
static int pcibios_init_resources(int busnr, struct pci_sys_data *sys)

{

	int ret;

	struct pci_host_bridge_window *window;

	struct resource_entry *window;



	if (list_empty(&sys->resources)) {

		pci_add_resource_offset(&sys->resources,

			 &iomem_resource, sys->mem_offset);

	}



	list_for_each_entry(window, &sys->resources, list) {

	resource_list_for_each_entry(window, &sys->resources)

		if (resource_type(window->res) == IORESOURCE_IO)

			return 0;

	}



	sys->io_res.start = (busnr * SZ_64K) ?  : pcibios_min_io;

	sys->io_res.end = (busnr + 1) * SZ_64K - 1;

arch/x86/pci/bus_numa.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) 
{

	struct pci_root_info *info = x86_find_pci_root_info(bus);

	struct pci_root_res *root_res;

	struct pci_host_bridge_window *window;

	struct resource_entry *window;

	bool found = false;



	if (!info)
@@ -41,7 +41,7 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) 
	       bus);



	/* already added by acpi ? */

	list_for_each_entry(window, resources, list)

	resource_list_for_each_entry(window, resources)

		if (window->res->flags & IORESOURCE_BUS) {

			found = true;

			break;

drivers/pci/bus.c

+6 −12
Original line number Diff line number Diff line
@@ -20,17 +20,16 @@ 
void pci_add_resource_offset(struct list_head *resources, struct resource *res,

			     resource_size_t offset)

{

	struct pci_host_bridge_window *window;

	struct resource_entry *entry;



	window = kzalloc(sizeof(struct pci_host_bridge_window), GFP_KERNEL);

	if (!window) {

	entry = resource_list_create_entry(res, 0);

	if (!entry) {

		printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res);

		return;

	}



	window->res = res;

	window->offset = offset;

	list_add_tail(&window->list, resources);

	entry->offset = offset;

	resource_list_add_tail(entry, resources);

}

EXPORT_SYMBOL(pci_add_resource_offset);
@@ -42,12 +41,7 @@ EXPORT_SYMBOL(pci_add_resource); 


void pci_free_resource_list(struct list_head *resources)

{

	struct pci_host_bridge_window *window, *tmp;



	list_for_each_entry_safe(window, tmp, resources, list) {

		list_del(&window->list);

		kfree(window);

	}

	resource_list_free(resources);

}

EXPORT_SYMBOL(pci_free_resource_list);

drivers/pci/host-bridge.c

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 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(bus);

	struct pci_host_bridge_window *window;

	struct resource_entry *window;

	resource_size_t offset = 0;



	list_for_each_entry(window, &bridge->windows, list) {

	resource_list_for_each_entry(window, &bridge->windows) {

		if (resource_contains(window->res, res)) {

			offset = window->offset;

			break;
@@ -60,10 +60,10 @@ 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(bus);

	struct pci_host_bridge_window *window;

	struct resource_entry *window;

	resource_size_t offset = 0;



	list_for_each_entry(window, &bridge->windows, list) {

	resource_list_for_each_entry(window, &bridge->windows) {

		struct pci_bus_region bus_region;



		if (resource_type(res) != resource_type(window->res))

drivers/pci/host/pci-host-generic.c

+2 −2
Original line number Diff line number Diff line
@@ -149,14 +149,14 @@ static int gen_pci_parse_request_of_pci_ranges(struct gen_pci *pci) 
	struct device *dev = pci->host.dev.parent;

	struct device_node *np = dev->of_node;

	resource_size_t iobase;

	struct pci_host_bridge_window *win;

	struct resource_entry *win;



	err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources,

					       &iobase);

	if (err)

		return err;



	list_for_each_entry(win, &pci->resources, list) {

	resource_list_for_each_entry(win, &pci->resources) {

		struct resource *parent, *res = win->res;



		switch (resource_type(res)) {