From patchwork Mon Jan 18 11:59:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 43060 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 09D69B7C31 for ; Mon, 18 Jan 2010 23:04:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518Ab0ARMEL (ORCPT ); Mon, 18 Jan 2010 07:04:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754336Ab0ARMEK (ORCPT ); Mon, 18 Jan 2010 07:04:10 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:63474 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754299Ab0ARMEI (ORCPT ); Mon, 18 Jan 2010 07:04:08 -0500 Received: by pwj9 with SMTP id 9so1666852pwj.21 for ; Mon, 18 Jan 2010 04:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=B6qrrb1mDkBnr1Q/gD8TFGyDfXLc/J7P5r26Da4hYUA=; b=iQ36alSR02yGLNq422KapCa1x4aUqqpymK9mU/Tj1EERspo+Pl6mxqYIU+MGo9Vh5k q90OsozyP1d4RegMAsftgEXNJxcm+E8QD+KEi8E1uS0pkXrUhphGkj2M9/dh0IYn6bSL zFEAbbtifs19Tezr16I1UHUn2wvAiSdErDOgM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; b=sbwzzA3m2Q47EXgA9sFnpOGb8yXFxa7QelbuN7yZqWfkAfzkQYK6pPOFgabuInXqRx NRuAZunhPVM0cKs7VjIsUvW4zAHGYgpzaLvDEX2dIuYtpRuvrxlZzUETbQx+Yc6lF08v t9a10I5rM4e10pwWKai9Tcl89ZRGkQ+OHawQc= Received: by 10.141.23.15 with SMTP id a15mr2073589rvj.202.1263816246070; Mon, 18 Jan 2010 04:04:06 -0800 (PST) Received: from ?192.168.0.100? ([121.168.21.96]) by mx.google.com with ESMTPS id 23sm4217171pzk.0.2010.01.18.04.04.03 (version=SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 04:04:04 -0800 (PST) Message-ID: <4B544D2C.8040400@ring3k.org> Date: Mon, 18 Jan 2010 20:59:40 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) MIME-Version: 1.0 To: "Rafael J. Wysocki" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Hemminger Subject: Re: Regression: Wake on LAN doesn't work in sky2 with 2.6.33-rc4-git2 References: <20100115091053.GA5477@mac.home> <201001152323.37718.rjw@sisk.pl> <20100117231932.GA5504@mac.home> <201001180136.45823.rjw@sisk.pl> <20100118083757.GA2619@mac.home> In-Reply-To: <20100118083757.GA2619@mac.home> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Tino Keitel wrote: > Hi, > > reverting this commit fixes WoL for me: > > commit 166a0fd4c788ec7f10ca8194ec6d526afa12db75 Hi Tino, Does this fix WoL also? Compile tested only... thanks, Mike Subject: [PATCH] sky2: Disable writes to PCI space before suspend Tino Keitel found that reverting 166a0fd4c fixes WoL for him. This suggests that PCI config should not be writable when suspended. Signed-off-by: Mike McCormack --- drivers/net/sky2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- 1.5.6.5 -- 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 diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 4c06020..b54edec 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4789,6 +4789,9 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) sky2_power_aux(hw); rtnl_unlock(); + /* disable writes to PCI config again */ + sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); + pci_save_state(pdev); pci_enable_wake(pdev, pci_choose_state(pdev, state), wol); pci_set_power_state(pdev, pci_choose_state(pdev, state));