From patchwork Tue Jul 1 07:16:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vidya Sagar X-Patchwork-Id: 4456871 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 202189F26C for ; Tue, 1 Jul 2014 07:17:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AB1420412 for ; Tue, 1 Jul 2014 07:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1D9320379 for ; Tue, 1 Jul 2014 07:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751074AbaGAHRQ (ORCPT ); Tue, 1 Jul 2014 03:17:16 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:7268 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750811AbaGAHRQ (ORCPT ); Tue, 1 Jul 2014 03:17:16 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Tue, 01 Jul 2014 00:16:17 -0700 Received: from hqemhub02.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Tue, 01 Jul 2014 00:10:46 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Tue, 01 Jul 2014 00:10:46 -0700 Received: from vidyas-desktop.nvidia.com (172.20.144.16) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server (TLS) id 8.3.342.0; Tue, 1 Jul 2014 00:17:15 -0700 From: Vidya Sagar To: , , , , , , CC: , Vidya Sagar Subject: [PATCH v1] PCI: enable ASPM configuration in PCIE POWERSAVE mode Date: Tue, 1 Jul 2014 12:46:18 +0530 Message-ID: <1404198978-26593-1-git-send-email-vidyas@nvidia.com> X-Mailer: git-send-email 1.8.1.5 X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 1a680b7c moved pcie_aspm_powersave_config_link() out of pci_raw_set_power_state() to pci_set_power_state() which would enable ASPM. But, with commit db288c9c, which re-introduced the following check ./drivers/pci/pci.c: pci_set_power_state() + /* Check if we're already there */ + if (dev->current_state == state) + return 0; in pci_set_power_state(), call to pcie_aspm_powersave_config_link() is never made leaving ASPM broken. Fix it by not returning from when the above condition is true, rather, jump to ASPM configuration code and exit from there eventually. Signed-off-by: Vidya Sagar --- drivers/pci/pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1c8592b..ded24c4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -804,7 +804,7 @@ EXPORT_SYMBOL_GPL(__pci_complete_power_transition); */ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) { - int error; + int error = 0; /* bound the state we're entering */ if (state > PCI_D3cold) @@ -821,7 +821,7 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) /* Check if we're already there */ if (dev->current_state == state) - return 0; + goto config_aspm; __pci_start_power_transition(dev, state); @@ -839,6 +839,8 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) if (!__pci_complete_power_transition(dev, state)) error = 0; + +config_aspm: /* * When aspm_policy is "powersave" this call ensures * that ASPM is configured.