From patchwork Fri Jan 18 18:24:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Lawrence X-Patchwork-Id: 2004041 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5B3C5DFB78 for ; Fri, 18 Jan 2013 19:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754816Ab3ARTJb (ORCPT ); Fri, 18 Jan 2013 14:09:31 -0500 Received: from mailhub4.stratus.com ([134.111.1.17]:35604 "EHLO mailhub4.stratus.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754817Ab3ARTJ2 (ORCPT ); Fri, 18 Jan 2013 14:09:28 -0500 Received: from EXHQ.corp.stratus.com (exhq.corp.stratus.com [134.111.201.100]) by mailhub4.stratus.com (8.12.11/8.12.11) with ESMTP id r0IISFeQ014536; Fri, 18 Jan 2013 13:28:15 -0500 Received: from jlaw-desktop.mno.stratus.com ([134.111.199.152]) by EXHQ.corp.stratus.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 18 Jan 2013 13:28:14 -0500 Date: Fri, 18 Jan 2013 13:24:55 -0500 (EST) From: Joe Lawrence X-X-Sender: jlaw@jlaw-desktop.mno.stratus.com To: Joe Lawrence cc: linux-pci@vger.kernel.org, Matthew Garrett , Myron Stowe , David Bulkow Subject: [PATCH 2/2] PCI: Don't touch ASPM if forcibly disabled In-Reply-To: Message-ID: References: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-OriginalArrivalTime: 18 Jan 2013 18:28:14.0832 (UTC) FILETIME=[9433E700:01CDF5A9] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From 108cca7bee5b04f45d9712507d14b5f3fbc22c29 Mon Sep 17 00:00:00 2001 From: Joe Lawrence Date: Tue, 15 Jan 2013 15:31:28 -0500 Subject: [PATCH 2/2] PCI: Don't touch ASPM if forcibly disabled Don't allocate and track PCIe ASPM state when "pcie_aspm=off" is specified on the kernel parameter list. Based-on-patch-from: Matthew Garrett Reviewed-by: David Bulkow Signed-off-by: Joe Lawrence Acked-by: Myron Stowe --- drivers/pci/pcie/aspm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 6122447..f912a93 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -556,6 +556,9 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) struct pcie_link_state *link; int blacklist = !!pcie_aspm_sanity_check(pdev); + if (!aspm_support_enabled) + return; + if (!pci_is_pcie(pdev) || pdev->link_state) return; if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&