Commit 51e53738 authored Nov 21, 2014 by Alex Williamson Committed by Bjorn Helgaas Jan 16, 2015

PCI: Add flag for devices that don't reset on D3hot->D0 transition

Per the PCI Power Management spec r1.2, sec 3.2.4, a device that advertises
No_Soft_Reset == 0 in the PMCSR register (reported by lspci as "NoSoftRst-")
should perform an internal reset when transitioning from D3hot to D0 via
software control. Configuration context is lost and the device requires a
full reinitialization sequence.

Unfortunately the definition of "internal reset", beyond the application of
the configuration context, is largely left to the interpretation of the
specific device. Some devices don't seem to perform an "internal reset"
even if they report No_Soft_Reset == 0.

We still need to honor the PCI specification and restore PCI config context
in the event that we do a PM reset, so we don't cache and modify the
PCI_PM_CTRL_NO_SOFT_RESET bit for the device, but for interfaces where the
intention is to reset the device, like pci_reset_function(), we need a
mechanism to flag that PM reset (a D3hot->D0 transition) doesn't perform
any significant "internal reset" of the device.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent c3e59ee4

drivers/pci/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3197,7 +3197,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe)
		{
		u16 csr;

		if (!dev->pm_cap)
		if (!dev->pm_cap \|\| dev->dev_flags & PCI_DEV_FLAGS_NO_PM_RESET)
		return -ENOTTY;

		pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &csr);

include/linux/pci.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,8 @@ enum pci_dev_flags {
		PCI_DEV_FLAG_PCIE_BRIDGE_ALIAS = (__force pci_dev_flags_t) (1 << 5),
		/* Do not use bus resets for device */
		PCI_DEV_FLAGS_NO_BUS_RESET = (__force pci_dev_flags_t) (1 << 6),
		/* Do not use PM reset even if device advertises NoSoftRst- */
		PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),
		};

		enum pci_irq_reroute_variant {

Admin message