Skip to content

Commit fc96b23

Browse files
committed
Merge tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci fix from Bjorn Helgaas: - Revert a reset patch that broke VFIO passthrough because devices ended up with no available reset mechanisms (Alex Williamson) * tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: Revert "PCI: Avoid reset when disabled via sysfs"
2 parents 9e99c1a + bc0b828 commit fc96b23

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/pci/pci.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5429,8 +5429,6 @@ static bool pci_bus_resettable(struct pci_bus *bus)
54295429
return false;
54305430

54315431
list_for_each_entry(dev, &bus->devices, bus_list) {
5432-
if (!pci_reset_supported(dev))
5433-
return false;
54345432
if (dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET ||
54355433
(dev->subordinate && !pci_bus_resettable(dev->subordinate)))
54365434
return false;
@@ -5507,8 +5505,6 @@ static bool pci_slot_resettable(struct pci_slot *slot)
55075505
list_for_each_entry(dev, &slot->bus->devices, bus_list) {
55085506
if (!dev->slot || dev->slot != slot)
55095507
continue;
5510-
if (!pci_reset_supported(dev))
5511-
return false;
55125508
if (dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET ||
55135509
(dev->subordinate && !pci_bus_resettable(dev->subordinate)))
55145510
return false;

0 commit comments

Comments
 (0)