Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: xVmg+ZTE45vTjaA1Z12DM1lrGJwEsccig8ip4gjq9uQgNzJJH261aXSHtjh9EVVOX7YiEhNIOk
 xEW1xo+QxdmA==
IronPort-SDR: K0yjAZy610D6k9RTK94qF0OPB+3/hO7QSMCyxoZ+6lbEMfm5eu7RIxWukRyc/CU0x/sZOJJ5BT
 vasYfCf1i1Tw==
From:   "David E. Box" <david.e.box@linux.intel.com>
To:     bhelgaas@google.com, rafael@kernel.org, len.brown@intel.com
Cc:     "David E. Box" <david.e.box@linux.intel.com>,
        linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] PCI: Disable Precision Time Measurement during suspend
Date:   Wed, 18 Nov 2020 16:18:22 -0800
Message-Id: <20201119001822.31617-2-david.e.box@linux.intel.com>
In-Reply-To: <20201119001822.31617-1-david.e.box@linux.intel.com>
References: <20201119001822.31617-1-david.e.box@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Intel client platforms that support suspend-to-idle, like Ice Lake,
root ports that have Precision Time Management (PTM) enabled can prevent
the port from being fully power gated, causing higher power consumption
while suspended.  To prevent this, after saving the PTM control register,
disable the feature.  The feature will be returned to its previous state
during restore.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=209361
Reported-by: Len Brown <len.brown@intel.com>
Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/pci/pci.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6fd4ae910a88..a2b40497d443 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/suspend.h>
 #include <linux/log2.h>
 #include <linux/logic_pio.h>
 #include <linux/pm_wakeup.h>
@@ -1543,7 +1544,7 @@ static void pci_save_ptm_state(struct pci_dev *dev)
 {
 	int ptm;
 	struct pci_cap_saved_state *save_state;
-	u16 *cap;
+	u16 *cap, ctrl;
 
 	if (!pci_is_pcie(dev))
 		return;
@@ -1560,6 +1561,17 @@ static void pci_save_ptm_state(struct pci_dev *dev)
 
 	cap = (u16 *)&save_state->cap.data[0];
 	pci_read_config_word(dev, ptm + PCI_PTM_CTRL, cap);
+
+	/*
+	 * On Intel systems that support suspend-to-idle, additional
+	 * power savings can be gained by disabling PTM on root ports,
+	 * as this allows the port to enter a deeper pm state.
+	 */
+	if (pm_suspend_target_state == PM_SUSPEND_TO_IDLE &&
+	    pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) {
+		ctrl = *cap & ~(PCI_PTM_CTRL_ENABLE | PCI_PTM_CTRL_ROOT);
+		pci_write_config_word(dev, ptm + PCI_PTM_CTRL, ctrl);
+	}
 }
 
 static void pci_restore_ptm_state(struct pci_dev *dev)
-- 
2.20.1