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

Merge tag 'pci-v6.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull PCI fixes from Bjorn Helgaas:

 - Set up runtime PM even for devices that lack a PM Capability as we
   did before 4d4c10f7 ("PCI: Explicitly put devices into D0 when
   initializing"), which broke resume in some VFIO scenarios (Mario
   Limonciello)

 - Ignore pciehp Presence Detect Changed events caused by DPC, even if
   they occur after a Data Link Layer State Changed event, to fix a VFIO
   GPU passthrough regression in v6.13 (Lukas Wunner)

* tag 'pci-v6.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: pciehp: Ignore belated Presence Detect Changed caused by DPC
  PCI/PM: Set up runtime PM even for devices without PCI PM
parents afa3d8b6 bbf10cd6

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id) 
		u16 ignored_events = PCI_EXP_SLTSTA_DLLSC;



		if (!ctrl->inband_presence_disabled)

			ignored_events |= events & PCI_EXP_SLTSTA_PDC;

			ignored_events |= PCI_EXP_SLTSTA_PDC;



		events &= ~ignored_events;

		pciehp_ignore_link_change(ctrl, pdev, irq, ignored_events);

drivers/pci/pci.c

+3 −2
Original line number Diff line number Diff line
@@ -3217,14 +3217,14 @@ void pci_pm_init(struct pci_dev *dev) 
	/* find PCI PM capability in list */

	pm = pci_find_capability(dev, PCI_CAP_ID_PM);

	if (!pm)

		return;

		goto poweron;

	/* Check device's ability to generate PME# */

	pci_read_config_word(dev, pm + PCI_PM_PMC, &pmc);



	if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {

		pci_err(dev, "unsupported PM cap regs version (%u)\n",

			pmc & PCI_PM_CAP_VER_MASK);

		return;

		goto poweron;

	}



	dev->pm_cap = pm;
@@ -3269,6 +3269,7 @@ void pci_pm_init(struct pci_dev *dev) 
	pci_read_config_word(dev, PCI_STATUS, &status);

	if (status & PCI_STATUS_IMM_READY)

		dev->imm_ready = 1;

poweron:

	pci_pm_power_up_and_verify_state(dev);

	pm_runtime_forbid(&dev->dev);

	pm_runtime_set_active(&dev->dev);