Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2eac4d3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PCI / PM: Use the NEVER_SKIP driver flag 



Replace the PCI-specific flag PCI_DEV_FLAGS_NEEDS_RESUME with the
PM core's DPM_FLAG_NEVER_SKIP one everywhere and drop it.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 08810a41

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * becaue the HDA driver may require us to enable the audio power

	 * domain during system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;

	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);



	ret = i915_driver_init_early(dev_priv, ent);

	if (ret < 0)

drivers/misc/mei/pci-me.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * MEI requires to resume from runtime suspend mode

	 * in order to perform link reset flow upon system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;

	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);



	/*

	* For not wake-able HW runtime pm framework

drivers/misc/mei/pci-txe.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * MEI requires to resume from runtime suspend mode

	 * in order to perform link reset flow upon system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;

	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);



	/*

	* For not wake-able HW runtime pm framework

drivers/pci/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -2166,8 +2166,7 @@ bool pci_dev_keep_suspended(struct pci_dev *pci_dev) 


	if (!pm_runtime_suspended(dev)

	    || pci_target_state(pci_dev, wakeup) != pci_dev->current_state

	    || platform_pci_need_resume(pci_dev)

	    || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME))

	    || platform_pci_need_resume(pci_dev))

		return false;



	/*

include/linux/pci.h

+1 −6
Original line number Diff line number Diff line
@@ -205,13 +205,8 @@ enum pci_dev_flags { 
	PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),

	/* Do not use FLR even if device advertises PCI_AF_CAP */

	PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),

	/*

	 * Resume before calling the driver's system suspend hooks, disabling

	 * the direct_complete optimization.

	 */

	PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11),

	/* Don't use Relaxed Ordering for TLPs directed at this device */

	PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 12),

	PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),

};



enum pci_irq_reroute_variant {