From patchwork Thu Sep 3 16:16:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 32900 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8A0DAB6F2B for ; Fri, 4 Sep 2009 02:17:17 +1000 (EST) Received: by ozlabs.org (Postfix) id 79BB2DDD0B; Fri, 4 Sep 2009 02:17:17 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 0A231DDD04 for ; Fri, 4 Sep 2009 02:17:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755867AbZICQRF (ORCPT ); Thu, 3 Sep 2009 12:17:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755834AbZICQRF (ORCPT ); Thu, 3 Sep 2009 12:17:05 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:34410 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755817AbZICQRE (ORCPT ); Thu, 3 Sep 2009 12:17:04 -0400 Received: from nehalam (pool-71-117-243-208.ptldor.fios.verizon.net [71.117.243.208]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n83GGVLp012831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 3 Sep 2009 09:16:35 -0700 Date: Thu, 3 Sep 2009 09:16:25 -0700 From: Stephen Hemminger To: Rene Mayrhofer , David Miller Cc: Mike McCormack , netdev@vger.kernel.org, Richard Leitner Subject: [PATCH] sky2: only enable Vaux if capable of wakeup Message-ID: <20090903091625.2e6aff91@nehalam> In-Reply-To: <200908311158.57972.rene.mayrhofer@gibraltar.at> References: <4A9928C9.7000907@ring3k.org> <200908311158.57972.rene.mayrhofer@gibraltar.at> Organization: Linux Foundation X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Spam-Status: No, hits=-5.872 required=5 tests=AWL, BAYES_00, FH_HOST_EQ_VERIZON_P, OSDL_HEADER_SUBJECT_BRACKETED, PATCH_SUBJECT_OSDL, RDNS_DYNAMIC X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While perusing vendor driver, I saw that it did not enable the Vaux power unless device was able to wake from lan for D3cold. This might help for Rene's power issue. Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/sky2.c 2009-09-03 09:01:24.668473584 -0700 +++ b/drivers/net/sky2.c 2009-09-03 09:10:18.949088574 -0700 @@ -272,8 +272,9 @@ static void sky2_power_aux(struct sky2_h Y2_CLK_GAT_LNK1_DIS | Y2_PCI_CLK_LNK2_DIS | Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS); - /* switch power to VAUX */ - if (sky2_read32(hw, B0_CTST) & Y2_VAUX_AVAIL) + /* switch power to VAUX if supported and PME from D3cold */ + if ( (sky2_read32(hw, B0_CTST) & Y2_VAUX_AVAIL) && + pci_pme_capable(hw->pdev, PCI_D3cold)) sky2_write8(hw, B0_POWER_CTRL, (PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_ON | PC_VCC_OFF));