From patchwork Mon Jul 14 06:04:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vidya sagar X-Patchwork-Id: 369503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3A4F5140093 for ; Mon, 14 Jul 2014 16:05:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753191AbaGNGFp (ORCPT ); Mon, 14 Jul 2014 02:05:45 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:42640 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752949AbaGNGFn (ORCPT ); Mon, 14 Jul 2014 02:05:43 -0400 Received: by mail-pd0-f182.google.com with SMTP id fp1so1823710pdb.13 for ; Sun, 13 Jul 2014 23:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DqLRicBSOrOk4oVRW5wQkwCLMNMqUTgutTr+UWsFxZU=; b=smhzZdO++yPGDt9zJJ4P8K9Oy159V8ZwBhUxK9be27Fr2mgAVkpEsAoZc6ks/bY057 8RI6iTNIbhAL9k7Pp67jaN/rSZvhiweqbrjwvjDT5O6rcP91v0G9zYn+xEN0Nu5TJNUZ aiZhZ0nhESjdwlaJi4pFKyxVbhnsX+iQRnu7k2BvUODoABnxvz5gDyOZEFH+VWev0USS +vJAdTklVPxcAyXatOZbmGjfjgZ1pAxlpuiEcxzBs+fwjuTz0VVNARVpOVcwUThw1uCu KCP1jlPrzrQnzBEv2JZyfm+qJHr5nJrlqplWQ3udZGvY6/lIFgf+OP91iq5kY4jLyiWl SzLw== X-Received: by 10.66.97.6 with SMTP id dw6mr14826926pab.41.1405317942207; Sun, 13 Jul 2014 23:05:42 -0700 (PDT) Received: from localhost.localdomain ([106.216.255.223]) by mx.google.com with ESMTPSA id y2sm12953544pdl.38.2014.07.13.23.05.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 13 Jul 2014 23:05:41 -0700 (PDT) From: Vidya Sagar X-Google-Original-From: Vidya Sagar To: bhelgaas@google.com, rjw@rjwysocki.net, nchumbalkar@lenovo.com, thierry.reding@gmail.com, swarren@nvidia.com, kthota@nvidia.com, linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, vidyas@nvidia.com, Vidya Sagar Subject: [PATCH v2] PCI: enable ASPM configuration in PCIE POWERSAVE mode Date: Mon, 14 Jul 2014 11:34:37 +0530 Message-Id: <1405317877-15060-1-git-send-email-vidyas@nvidia.com> X-Mailer: git-send-email 1.8.1.5 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Vidya Sagar 'commit 1a680b7c3258 ("PCI: PCIe links may not get configured for ASPM under POWERSAVE mode")' 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 db288c9c5f9d ("PCI / PM: restore the original behavior of pci_set_power_state()")', 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 --- v2: * Calling ASPM config code is moved from pci_set_power_state() to * do_pci_enable_device() drivers/pci/pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1c8592b..81d49d3 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -839,12 +839,6 @@ 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; } @@ -1195,12 +1189,18 @@ int __weak pcibios_enable_device(struct pci_dev *dev, int bars) static int do_pci_enable_device(struct pci_dev *dev, int bars) { int err; + struct pci_dev *bridge; u16 cmd; u8 pin; err = pci_set_power_state(dev, PCI_D0); if (err < 0 && err != -EIO) return err; + + bridge = pci_upstream_bridge(dev); + if (bridge) + pcie_aspm_powersave_config_link(bridge); + err = pcibios_enable_device(dev, bars); if (err < 0) return err;