From patchwork Fri Nov 6 02:25:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 57991 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA62PYOA016303 for ; Fri, 6 Nov 2009 02:25:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755120AbZKFCZ0 (ORCPT ); Thu, 5 Nov 2009 21:25:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755969AbZKFCZ0 (ORCPT ); Thu, 5 Nov 2009 21:25:26 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:33487 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755120AbZKFCZ0 (ORCPT ); Thu, 5 Nov 2009 21:25:26 -0500 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id nA62PTis013896 for (envelope-from kaneshige.kenji@jp.fujitsu.com); Fri, 6 Nov 2009 11:25:30 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id C955745DE4E for ; Fri, 6 Nov 2009 11:25:29 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id A8AC845DE4D for ; Fri, 6 Nov 2009 11:25:29 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 90A651DB803F for ; Fri, 6 Nov 2009 11:25:29 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 438691DB803C for ; Fri, 6 Nov 2009 11:25:29 +0900 (JST) Received: from m108.css.fujitsu.com (m108 [127.0.0.1]) by m108.s.css.fujitsu.com (Postfix) with ESMTP id 19B7AB6800D; Fri, 6 Nov 2009 11:25:29 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by m108.s.css.fujitsu.com (Postfix) with ESMTP id B058EB6800B; Fri, 6 Nov 2009 11:25:28 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from KANE-LIFEBOOK[10.124.100.137] by KANE-LIFEBOOK (FujitsuOutboundMailChecker v1.3.1/9992[10.124.100.137]); Fri, 06 Nov 2009 11:25:16 +0900 (JST) Message-ID: <4AF38909.3040904@jp.fujitsu.com> Date: Fri, 06 Nov 2009 11:25:13 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: Alex Chiang CC: linux-pci@vger.kernel.org Subject: Re: BUG_ON(root->parent) in pcie_update_aspm_capable() References: <20091106004706.GB17182@ldl.fc.hp.com> In-Reply-To: <20091106004706.GB17182@ldl.fc.hp.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: 20091105/drivers/pci/pcie/aspm.c =================================================================== --- 20091105.orig/drivers/pci/pcie/aspm.c +++ 20091105/drivers/pci/pcie/aspm.c @@ -656,8 +656,10 @@ void pcie_aspm_exit_link_state(struct pc free_link_state(link); /* Recheck latencies and configure upstream links */ - pcie_update_aspm_capable(root); - pcie_config_aspm_path(parent_link); + if (parent_link) { + pcie_update_aspm_capable(root); + pcie_config_aspm_path(parent_link); + } out: mutex_unlock(&aspm_lock); up_read(&pci_bus_sem);