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

Commit 267efd7e authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

PCI hotplug: fix wrong assumption in acpi_get_hp_params_from_firmware 



Current acpi_get_hp_params_from_firmware() has a assumption that
pci_bus->self is NULL on the root pci bus. But it might not true on
some platforms. Because of this wrong assumption, current
acpi_get_hp_params_from_firmware() might cause endless loop. We must
check pci_bus->parent instead.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent d18690af

drivers/pci/hotplug/acpi_pcihp.c

+6 −11
Original line number Diff line number Diff line
@@ -332,19 +332,14 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, 
{

	acpi_status status = AE_NOT_FOUND;

	acpi_handle handle, phandle;

	struct pci_bus *pbus = bus;

	struct pci_dev *pdev;

	struct pci_bus *pbus;



	do {

		pdev = pbus->self;

		if (!pdev) {

			handle = acpi_get_pci_rootbridge_handle(

				pci_domain_nr(pbus), pbus->number);

	handle = NULL;

	for (pbus = bus; pbus; pbus = pbus->parent) {

		handle = acpi_pci_get_bridge_handle(pbus);

		if (handle)

			break;

	}

		handle = DEVICE_ACPI_HANDLE(&(pdev->dev));

		pbus = pbus->parent;

	} while (!handle);



	/*

	 * _HPP settings apply to all child buses, until another _HPP is