Commit 727ae8be authored Nov 27, 2015 by Liu Jiang Committed by Rafael J. Wysocki Dec 02, 2015

ACPI: Fix regression caused by commit 4d6b4e69

Commit 4d6b4e69 ("x86/PCI/ACPI: Use common interface to support
PCI host bridge") converted x86 to use the common interface
acpi_pci_root_create, but the conversion missed on code piece in
arch/x86/pci/bus_numa.c, which causes regression on some legacy
AMD platforms as reported by Arthur Marsh <arthur.marsh@internode.on.net>.
The root causes is that acpi_pci_root_create() fails to insert
host bridge resources into iomem_resource/ioport_resource because
x86_pci_root_bus_resources() has already inserted those resources.
So change x86_pci_root_bus_resources() to not insert resources into
iomem_resource/ioport_resource.

Fixes: 4d6b4e69 ("x86/PCI/ACPI: Use common interface to support PCI host bridge")
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Reported-and-tested-by: Arthur Marsh <arthur.marsh@internode.on.net>
Reported-and-tested-by: Krzysztof Kolasa <kkolasa@winsoft.pl>
Reported-and-tested-by: Keith Busch <keith.busch@intel.com>
Reported-and-tested-by: Hans de Bruin <jmdebruin@xmsnet.nl>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 768acd64

arch/x86/pci/bus_numa.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -50,18 +50,9 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
		if (!found)
		pci_add_resource(resources, &info->busn);

		list_for_each_entry(root_res, &info->resources, list) {
		struct resource *res;
		struct resource *root;
		list_for_each_entry(root_res, &info->resources, list)
		pci_add_resource(resources, &root_res->res);

		res = &root_res->res;
		pci_add_resource(resources, res);
		if (res->flags & IORESOURCE_IO)
		root = &ioport_resource;
		else
		root = &iomem_resource;
		insert_resource(root, res);
		}
		return;

		default_resources:

drivers/acpi/pci_root.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -768,6 +768,13 @@ static void pci_acpi_root_add_resources(struct acpi_pci_root_info *info)
		else
		continue;

		/*
		* Some legacy x86 host bridge drivers use iomem_resource and
		* ioport_resource as default resource pool, skip it.
		*/
		if (res == root)
		continue;

		conflict = insert_resource_conflict(root, res);
		if (conflict) {
		dev_info(&info->bridge->dev,