ACPI / hotplug: Fix conflicted PCI bridge notify handlers (ca499fc8) · Commits · 戴 / test

The PCI host bridge scan handler installs its own notify handler, handle_hotplug_event_root(), by itself. Nevertheless, the ACPI hotplug framework also installs the common notify handler, acpi_hotplug_notify_cb(), for PCI root bridges. This causes acpi_hotplug_notify_cb() to call _OST method with unsupported error as hotplug.enabled is not set. To address this issue, introduce hotplug.ignore flag, which indicates that the scan handler installs its own notify handler by itself. The ACPI hotplug framework does not install the common notify handler when this flag is set. Signed-off-by:

Toshi Kani <toshi.kani@hp.com> [rjw: Changed the name of the new flag] Cc: 3.9+ <stable@vger.kernel.org> # 3.9+ Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/pci_root.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ static struct acpi_scan_handler pci_root_handler = {
		.ids = root_device_ids,
		.attach = acpi_pci_root_add,
		.detach = acpi_pci_root_remove,
		.hotplug = {
		.ignore = true,
		},
		};

		static DEFINE_MUTEX(osc_lock);

drivers/acpi/scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1773,7 +1773,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
		*/
		list_for_each_entry(hwid, &pnp.ids, list) {
		handler = acpi_scan_match_handler(hwid->id, NULL);
		if (handler) {
		if (handler && !handler->hotplug.ignore) {
		acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
		acpi_hotplug_notify_cb, handler);
		break;

include/acpi/acpi_bus.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ enum acpi_hotplug_mode {
		struct acpi_hotplug_profile {
		struct kobject kobj;
		bool enabled:1;
		bool ignore:1;
		enum acpi_hotplug_mode mode;
		};

Admin message