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

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

x86/PCI: put busn resource in pci_root_info for native host bridge drivers 



Add the host bridge bus number aperture to the resource list.
Like the MMIO and I/O port apertures, this will be used when assigning
resources to hot-added devices or in the case of conflicts.

[bhelgaas: changelog, tidy printk]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 5c1d81d1

arch/x86/pci/amd_bus.c

+3 −4
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ static int __init early_fill_mp_bus_info(void) 
		link = (reg >> 8) & 0x03;



		info = alloc_pci_root_info(min_bus, max_bus, node, link);

		sprintf(info->name, "PCI Bus #%02x", min_bus);

	}



	/* get the default node and link for left over res */
@@ -300,9 +299,9 @@ static int __init early_fill_mp_bus_info(void) 
		int busnum;

		struct pci_root_res *root_res;



		busnum = info->bus_min;

		printk(KERN_DEBUG "bus: [%02x, %02x] on node %x link %x\n",

		       info->bus_min, info->bus_max, info->node, info->link);

		busnum = info->busn.start;

		printk(KERN_DEBUG "bus: %pR on node %x link %x\n",

		       &info->busn, info->node, info->link);

		list_for_each_entry(root_res, &info->resources, list)

			printk(KERN_DEBUG "bus: %02x %pR\n",

				       busnum, &root_res->res);

arch/x86/pci/bus_numa.c

+19 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static struct pci_root_info *x86_find_pci_root_info(int bus) 
		return NULL;



	list_for_each_entry(info, &pci_root_infos, list)

		if (info->bus_min == bus)

		if (info->busn.start == bus)

			return info;



	return NULL;
@@ -24,6 +24,8 @@ 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;

	bool found = false;



	if (!info)

		goto default_resources;
@@ -31,6 +33,16 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) 
	printk(KERN_DEBUG "PCI: root bus %02x: hardware-probed resources\n",

	       bus);



	/* already added by acpi ? */

	list_for_each_entry(window, resources, list)

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

			found = true;

			break;

		}



	if (!found)

		pci_add_resource(resources, &info->busn);



	list_for_each_entry(root_res, &info->resources, list) {

		struct resource *res;

		struct resource *root;
@@ -66,9 +78,13 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max, 
	if (!info)

		return info;



	sprintf(info->name, "PCI Bus #%02x", bus_min);



	INIT_LIST_HEAD(&info->resources);

	info->bus_min = bus_min;

	info->bus_max = bus_max;

	info->busn.name  = info->name;

	info->busn.start = bus_min;

	info->busn.end   = bus_max;

	info->busn.flags = IORESOURCE_BUS;

	info->node = node;

	info->link = link;

arch/x86/pci/bus_numa.h

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ struct pci_root_info { 
	struct list_head list;

	char name[12];

	struct list_head resources;

	int bus_min;

	int bus_max;

	struct resource busn;

	int node;

	int link;

};