From 279c998f74b6aeab7d972fd4c0183c68ad7f653a Mon Sep 17 00:00:00 2001
From: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Date: Mon, 21 Mar 2011 03:29:08 +0000
Subject: [PATCH] --- yaml --- r: 242601 b: refs/heads/master c:
 1a680b7c325882188865f05b9a88d32f75f26495 h: refs/heads/master i:   242599:
 4f54290a87442b5ffbf65195336f6e3094e72cd9 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/pci/pci.c        |  6 ++++++
 trunk/drivers/pci/pcie/aspm.c  | 22 ++++++++++++++++++++++
 trunk/include/linux/pci-aspm.h |  4 ++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 43466c151699..0d82ad70aed5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8bae901ce23addbdcdb54fa1696fb2d049feb5
+refs/heads/master: 1a680b7c325882188865f05b9a88d32f75f26495
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index b714d787bddd..2472e7177b4b 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -740,6 +740,12 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 
 	if (!__pci_complete_power_transition(dev, state))
 		error = 0;
+	/*
+	 * When aspm_policy is "powersave" this call ensures
+	 * that ASPM is configured.
+	 */
+	if (!error && dev->bus->self)
+		pcie_aspm_powersave_config_link(dev->bus->self);
 
 	return error;
 }
diff --git a/trunk/drivers/pci/pcie/aspm.c b/trunk/drivers/pci/pcie/aspm.c
index bbdb4fd85b9c..e61b82e611c2 100644
--- a/trunk/drivers/pci/pcie/aspm.c
+++ b/trunk/drivers/pci/pcie/aspm.c
@@ -708,6 +708,28 @@ void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 	up_read(&pci_bus_sem);
 }
 
+void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
+{
+	struct pcie_link_state *link = pdev->link_state;
+
+	if (aspm_disabled || !pci_is_pcie(pdev) || !link)
+		return;
+
+	if (aspm_policy != POLICY_POWERSAVE)
+		return;
+
+	if ((pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT) &&
+	    (pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM))
+		return;
+
+	down_read(&pci_bus_sem);
+	mutex_lock(&aspm_lock);
+	pcie_config_aspm_path(link);
+	pcie_set_clkpm(link, policy_to_clkpm_state(link));
+	mutex_unlock(&aspm_lock);
+	up_read(&pci_bus_sem);
+}
+
 /*
  * pci_disable_link_state - disable pci device's link state, so the link will
  * never enter specific states
diff --git a/trunk/include/linux/pci-aspm.h b/trunk/include/linux/pci-aspm.h
index ce6810512c66..67cb3ae38016 100644
--- a/trunk/include/linux/pci-aspm.h
+++ b/trunk/include/linux/pci-aspm.h
@@ -26,6 +26,7 @@
 extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
+extern void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
 extern void pci_disable_link_state(struct pci_dev *pdev, int state);
 extern void pcie_clear_aspm(void);
 extern void pcie_no_aspm(void);
@@ -39,6 +40,9 @@ static inline void pcie_aspm_exit_link_state(struct pci_dev *pdev)
 static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 {
 }
+static inline void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
+{
+}
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }