Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763542AbZGAArw (ORCPT ); Tue, 30 Jun 2009 20:47:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761351AbZGAAeK (ORCPT ); Tue, 30 Jun 2009 20:34:10 -0400 Received: from kroah.org ([198.145.64.141]:60030 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761315AbZGAAeI (ORCPT ); Tue, 30 Jun 2009 20:34:08 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jun 30 17:24:12 2009 Message-Id: <20090701002412.207950874@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 30 Jun 2009 17:22:52 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Shaohua Li , Jesse Barnes Subject: [patch 003/108] PCI: disable ASPM on VIA root-port-under-bridge configurations References: <20090701002249.937782934@mini.kroah.org> Content-Disposition: inline; filename=pci-disable-aspm-on-via-root-port-under-bridge-configurations.patch In-Reply-To: <20090701002838.GA7100@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1279 Lines: 30 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Shaohua Li commit 8e822df700694ca6850d1e0c122fd7004b2778d8 upstream. VIA has a strange chipset, it has root port under a bridge. Disable ASPM for such strange chipset. Tested-by: Wolfgang Denk Signed-off-by: Shaohua Li Signed-off-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pcie/aspm.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -638,6 +638,10 @@ void pcie_aspm_init_link_state(struct pc if (pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT && pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM) return; + /* VIA has a strange chipset, root port is under a bridge */ + if (pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT && + pdev->bus->self) + return; down_read(&pci_bus_sem); if (list_empty(&pdev->subordinate->devices)) goto out; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/