From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 15 Dec 2020 21:11:09 +0000 (-0600)
Subject: Merge branch 'pci/ptm'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=72b3a644bbe994add91249676d77c279b1d92376;p=linux.git

Merge branch 'pci/ptm'

- Save/restore Precision Time Measurement Capability for suspend/resume
  (David E. Box)

- Disable PTM during suspend to save power (David E. Box)

* pci/ptm:
  PCI: Disable PTM during suspend to save power
  PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume
---

72b3a644bbe994add91249676d77c279b1d92376
diff --cc drivers/pci/pci.c
index 6cdd7e641ca66,71dd5d7cbdeda..b9fecc25d2131
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1558,9 -1564,9 +1558,10 @@@ int pci_save_state(struct pci_dev *dev
  		return i;
  
  	pci_save_ltr_state(dev);
 +	pci_save_aspm_l1ss_state(dev);
  	pci_save_dpc_state(dev);
  	pci_save_aer_state(dev);
+ 	pci_save_ptm_state(dev);
  	return pci_save_vc_state(dev);
  }
  EXPORT_SYMBOL(pci_save_state);