PCI: cpcihp: missing curly braces in cpci_configure_slot()
Subsystems (3)
PATCH 1/1 PCI: cpcihp: missing curly braces in cpci_configure_slot()
I don't have this hardware but it looks like we weren't adding bridge devices as intended. Maybe the bridge is always the last device?
Fixes 05b125004815 ('PCI: cpcihp: Iterate over all devices in slot, not functions 0-7')
Signed-off-by Dan Carpenter <[email protected]>
drivers/pci/hotplug/cpci_hotplug_pci.c +2 -1
@@ -286,11 +286,12 @@ int cpci_configure_slot(struct slot *slot) } parent = slot->dev->bus; -list_for_each_entry (dev, &parent->devices, bus_list) +list_for_each_entry (dev, &parent->devices, bus_list) {if (PCI_SLOT (dev->devfn) !=PCI_SLOT (slot->devfn))continue ;if (pci_is_bridge (dev))pci_hp_add_bridge (dev); + }pci_assign_unassigned_bridge_resources (parent->self);
Quoted 12 lines · Dan Carpenter
I don't have this hardware but it looks like we weren't adding bridge devices as intended. Maybe the bridge is always the last device?
Fixes 05b125004815 ('PCI: cpcihp: Iterate over all devices in slot, not functions 0-7')Signed-off-by Dan Carpenter <[email protected]>drivers/pci/hotplug/cpci_hotplug_pci.c +0
-0@@ -286,11 +286,12 @@ int cpci_configure_slot(struct slot *slot) }
drivers/pci/hotplug/cpci_hotplug_pci.c int cpci_configure_slot(struct slot *slot) · line 295
Quoted 10 lines
drivers/pci/hotplug/cpci_hotplug_pci.c +2
-1parent = slot->dev->bus; -list_for_each_entry (dev, &parent->devices, bus_list) +list_for_each_entry (dev, &parent->devices, bus_list) {if (PCI_SLOT (dev->devfn) !=PCI_SLOT (slot->devfn))continue ;if (pci_is_bridge (dev))pci_hp_add_bridge (dev); + }
Good fix.
Acked-by Yijing Wang <[email protected]>
Thanks!
Yijing.
Quoted 4 lines
drivers/pci/hotplug/cpci_hotplug_pci.c +0
-0pci_assign_unassigned_bridge_resources (parent->self);
Signature · 2 lines
Thanks! Yijing
Bjorn Helgaas
maintainerQuoted 5 lines · Dan Carpenter
I don't have this hardware but it looks like we weren't adding bridge devices as intended. Maybe the bridge is always the last device?
Fixes 05b125004815 ('PCI: cpcihp: Iterate over all devices in slot, not functions 0-7')Signed-off-by Dan Carpenter <[email protected]>
Applied with Yijing's ack to for-linus for v4.0, thanks! Also marked for stable.
I'm afraid this is probably my fault, sorry.
Quoted 18 lines
drivers/pci/hotplug/cpci_hotplug_pci.c +2
-1@@ -286,11 +286,12 @@ int cpci_configure_slot(struct slot *slot) } parent = slot->dev->bus; -list_for_each_entry (dev, &parent->devices, bus_list) +list_for_each_entry (dev, &parent->devices, bus_list) {if (PCI_SLOT (dev->devfn) !=PCI_SLOT (slot->devfn))continue ;if (pci_is_bridge (dev))pci_hp_add_bridge (dev); + }pci_assign_unassigned_bridge_resources (parent->self);