]> git.baikalelectronics.ru Git - kernel.git/commit
x86/PCI/ACPI: Fix regression caused by commit 546b5f602dc6
authorLiu Jiang <jiang.liu@linux.intel.com>
Fri, 27 Nov 2015 03:12:33 +0000 (11:12 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 2 Dec 2015 01:30:15 +0000 (02:30 +0100)
commitd88291dc4fb63f827e034ddae79972605f489a54
tree8a4f4a7b9d0e00233a94548bf86a065a9693cd05
parentf007f6082406d12f22643c6d10d7188785628810
x86/PCI/ACPI: Fix regression caused by commit 546b5f602dc6

Commit 546b5f602dc6 ("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: 546b5f602dc6 ("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>
arch/x86/pci/bus_numa.c
drivers/acpi/pci_root.c