Commit 0d2493ab authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/pm' 

- Remove unused pcibios_pm_ops (Vaibhav Gupta)

- Rename pci_dev.d3_delay to d3hot_delay (Krzysztof Wilczyński)

- Apply D2 transition delay as microseconds, not milliseconds (Bjorn
  Helgaas)

* pci/pm:
  PCI/PM: Revert "PCI/PM: Apply D2 delay as milliseconds, not microseconds"
  PCI/PM: Remove unused PCI_PM_BUS_WAIT
  PCI/PM: Rename pci_dev.d3_delay to d3hot_delay
  PCI/PM: Remove unused pcibios_pm_ops
parents 5cfdc750 638c133e

Documentation/power/pci.rst

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ that these callbacks operate on:: 
	unsigned int	d2_support:1;	/* Low power state D2 is supported */

	unsigned int	no_d1d2:1;	/* D1 and D2 are forbidden */

	unsigned int	wakeup_prepared:1;  /* Device prepared for wake up */

	unsigned int	d3_delay;	/* D3->D0 transition time in ms */

	unsigned int	d3hot_delay;	/* D3hot->D0 transition time in ms */

	...

  };

arch/x86/pci/fixup.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0xa26d, pci_invalid_bar); 
static void pci_fixup_amd_ehci_pme(struct pci_dev *dev)

{

	dev_info(&dev->dev, "PME# does not work under D3, disabling it\n");

	dev->pme_support &= ~((PCI_PM_CAP_PME_D3 | PCI_PM_CAP_PME_D3cold)

	dev->pme_support &= ~((PCI_PM_CAP_PME_D3hot | PCI_PM_CAP_PME_D3cold)

		>> PCI_PM_CAP_PME_SHIFT);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x7808, pci_fixup_amd_ehci_pme);

arch/x86/pci/intel_mid_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void pci_d3delay_fixup(struct pci_dev *dev) 
	 */

	if (type1_access_ok(dev->bus->number, dev->devfn, PCI_DEVICE_ID))

		return;

	dev->d3_delay = 0;

	dev->d3hot_delay = 0;

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup);

drivers/hid/intel-ish-hid/ipc/ipc.c

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ static int _ish_hw_reset(struct ishtp_device *dev) 
	csr |= PCI_D3hot;

	pci_write_config_word(pdev, pdev->pm_cap + PCI_PM_CTRL, csr);



	mdelay(pdev->d3_delay);

	mdelay(pdev->d3hot_delay);



	csr &= ~PCI_PM_CTRL_STATE_MASK;

	csr |= PCI_D0;

drivers/net/ethernet/marvell/sky2.c

+1 −1
Original line number Diff line number Diff line
@@ -5105,7 +5105,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	INIT_WORK(&hw->restart_work, sky2_restart);



	pci_set_drvdata(pdev, hw);

	pdev->d3_delay = 300;

	pdev->d3hot_delay = 300;



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE