Commit fc96b232 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 9e99c1ac bc0b828e

drivers/pci/pci.c

+0 −4
Original line number Diff line number Diff line
@@ -5429,8 +5429,6 @@ static bool pci_bus_resettable(struct pci_bus *bus) 
		return false;



	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (!pci_reset_supported(dev))

			return false;

		if (dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET ||

		    (dev->subordinate && !pci_bus_resettable(dev->subordinate)))

			return false;
@@ -5507,8 +5505,6 @@ static bool pci_slot_resettable(struct pci_slot *slot) 
	list_for_each_entry(dev, &slot->bus->devices, bus_list) {

		if (!dev->slot || dev->slot != slot)

			continue;

		if (!pci_reset_supported(dev))

			return false;

		if (dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET ||

		    (dev->subordinate && !pci_bus_resettable(dev->subordinate)))

			return false;