ACPI / hotplug / PCI: Always rescan the slot for new devices
PATCH 1/1 ACPI / hotplug / PCI: Always rescan the slot for new devices
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the enable_slot() to check return value of pci_scan_slot() and if it is zero return early from the function. It means that there were no new devices in this particular slot.
However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what acpiphp_rescan_slot() returns and on zero bail out early.
---
Alex,
Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Thanks.
drivers/pci/hotplug/acpiphp_glue.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/pci/hotplug/acpiphp_glue.c +1 -5
@@ -552,9 +552,8 @@ static void __ref enable_slot(struct acpiphp_slot *slot)struct acpiphp_func *func;int max, pass;LIST_HEAD (add_list); -int nr_found; - nr_found =acpiphp_rescan_slot (slot); +acpiphp_rescan_slot (slot); max =acpiphp_max_busnr (bus);for (pass =0 ; pass <2 ; pass++) {list_for_each_entry (dev, &bus->devices, bus_list) {
@@ -574,9 +573,6 @@ static void __ref enable_slot(struct acpiphp_slot *slot) } }__pci_bus_assign_resources (bus, &add_list,NULL ); -/* Nothing more to do here if there are no new devices on this bus. */ -if (!nr_found && (slot->flags &SLOT_ENABLED )) -return ;acpiphp_sanitize_bus (bus);acpiphp_set_hpp_values (bus);
Signature · 1 line
1.8.4.rc3
Quoted 13 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
Quoted 4 lines
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.Signed-off-by Mika Westerberg <[email protected]>
So, this is a revert of commit a47d8c8, correct?
Rafael
Quoted 37 lines
---
Alex,Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Thanks.
drivers/pci/hotplug/acpiphp_glue.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/pci/hotplug/acpiphp_glue.c +1
-5@@ -552,9 +552,8 @@ static void __ref enable_slot(struct acpiphp_slot *slot)struct acpiphp_func *func;int max, pass;LIST_HEAD (add_list); -int nr_found; - nr_found =acpiphp_rescan_slot (slot); +acpiphp_rescan_slot (slot); max =acpiphp_max_busnr (bus);for (pass =0 ; pass <2 ; pass++) {list_for_each_entry (dev, &bus->devices, bus_list) {@@ -574,9 +573,6 @@ static void __ref enable_slot(struct acpiphp_slot *slot) } }__pci_bus_assign_resources (bus, &add_list,NULL ); -/* Nothing more to do here if there are no new devices on this bus. */ -if (!nr_found && (slot->flags &SLOT_ENABLED )) -return ;acpiphp_sanitize_bus (bus);acpiphp_set_hpp_values (bus);
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Quoted 14 lines · Rafael J. Wysocki
Quoted 13 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
Quoted 6 lines
Quoted 4 lines
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.Signed-off-by Mika Westerberg <[email protected]>So, this is a revert of commit a47d8c8, correct?
Correct.
Plain revert didn't work because the code has changed after that commit.
Quoted 18 lines · Mika Westerberg
Quoted 17 lines · Rafael J. Wysocki
Quoted 16 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Mika Westerberg <[email protected]>So, this is a revert of commit a47d8c8, correct?
Correct.
Plain revert didn't work because the code has changed after that commit.
Yeah.
Well, it would be good to know if it affects the Alex' system, but anyway I added it to the 3.13 queue for now. We may be able to get it into 3.12 if Alex confirms that it works for him shortly, but if that doesn't happen we can just ask stable to pick it up later.
Thanks!
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Quoted 16 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.
Quoted 6 lines
Signed-off-by Mika Westerberg <[email protected]>---
Alex,Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Looks ok to me, no new console output or boot delay. Thanks,
Alex
Quoted 28 lines
drivers/pci/hotplug/acpiphp_glue.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/pci/hotplug/acpiphp_glue.c +1
-5@@ -552,9 +552,8 @@ static void __ref enable_slot(struct acpiphp_slot *slot)struct acpiphp_func *func;int max, pass;LIST_HEAD (add_list); -int nr_found; - nr_found =acpiphp_rescan_slot (slot); +acpiphp_rescan_slot (slot); max =acpiphp_max_busnr (bus);for (pass =0 ; pass <2 ; pass++) {list_for_each_entry (dev, &bus->devices, bus_list) {@@ -574,9 +573,6 @@ static void __ref enable_slot(struct acpiphp_slot *slot) } }__pci_bus_assign_resources (bus, &add_list,NULL ); -/* Nothing more to do here if there are no new devices on this bus. */ -if (!nr_found && (slot->flags &SLOT_ENABLED )) -return ;acpiphp_sanitize_bus (bus);acpiphp_set_hpp_values (bus);
Quoted 17 lines · Alex Williamson
Quoted 16 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Mika Westerberg <[email protected]>---
Alex,Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Looks ok to me, no new console output or boot delay. Thanks,
Great, thanks!
May I add your Tested-by to it, then?
Rafael
Alex Williamson
Tested-byQuoted 22 lines · Rafael J. Wysocki
Quoted 21 lines · Alex Williamson
Quoted 20 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.Signed-off-by Mika Westerberg <[email protected]>---
Alex,
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Looks ok to me, no new console output or boot delay. Thanks,
Great, thanks!
May I add your Tested-by to it, then?
Sure
Quoted 17 lines · Alex Williamson
Quoted 16 lines · Mika Westerberg
Commit 2dc4128 (ACPI / hotplug / PCI: Avoid doing too much for spurious notifies) changed the
enable_slot()to check return value ofpci_scan_slot()and if it is zero return early from the function. It means that there were no new devices in this particular slot.However, if a device appeared deeper in the hierarchy the code now ignores it causing things like Thunderbolt chaining fail to recognize new devices.
The problem with Alex Williamson's machine was solved with commit a47d8c8 (ACPI / hotplug / PCI: Avoid parent bus rescans on spurious device checks) and hence we should be able to restore the original functionality that we always rescan on bus check notification.
On a device check notification we still check what
acpiphp_rescan_slot()returns and on zero bail out early.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Mika Westerberg <[email protected]>---
Alex,Are you able to check if your machine still works and doesn't slow down during boot after this patch is applied?
Looks ok to me, no new console output or boot delay. Thanks,
Thanks!