All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: netdev@vger.kernel.org
Cc: David Miller <davem@davemloft.net>,
	Matt Carlson <mcarlson@broadcom.com>,
	Michael Chan <mchan@broadcom.com>,
	Linux PM mailing list <linux-pm@lists.linux-foundation.org>,
	Thomas Fjellstrom <thomas@fjellstrom.ca>,
	Jay Cliburn <jcliburn@gmail.com>,
	Chris Snook <chris.snook@gmail.com>,
	Jie Yang <jie.yang@atheros.com>
Subject: [PATCH 1/3] tg3: Avoid setting power.can_wakeup for devices that cannot wake up
Date: Thu, 10 Feb 2011 17:53:09 +0100	[thread overview]
Message-ID: <201102101753.09504.rjw@sisk.pl> (raw)
In-Reply-To: <201102101751.56508.rjw@sisk.pl>

From: Rafael J. Wysocki <rjw@sisk.pl>

The tg3 driver uses device_init_wakeup() in such a way that the
device's power.can_wakeup flag may be set even though the PCI
subsystem cleared it before, in which case the device cannot wake
up the system from sleep states.  Modify the driver to only change
the power.can_wakeup flag if the device is not capable of generating
wakeup signals.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/net/tg3.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/net/tg3.c
===================================================================
--- linux-2.6.orig/drivers/net/tg3.c
+++ linux-2.6/drivers/net/tg3.c
@@ -12403,9 +12403,11 @@ static void __devinit tg3_get_eeprom_hw_
 			tp->tg3_flags3 |= TG3_FLG3_RGMII_EXT_IBND_TX_EN;
 	}
 done:
-	device_init_wakeup(&tp->pdev->dev, tp->tg3_flags & TG3_FLAG_WOL_CAP);
-	device_set_wakeup_enable(&tp->pdev->dev,
+	if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+		device_set_wakeup_enable(&tp->pdev->dev,
 				 tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
+	else
+		device_set_wakeup_capable(&tp->pdev->dev, false);
 }
 
 static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd)


  parent reply	other threads:[~2011-02-10 16:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-10 16:51 [PATCH 0/3] Net driver fixes related to power management Rafael J. Wysocki
2011-02-10 16:53 ` [PATCH 1/3] tg3: Avoid setting power.can_wakeup for devices that cannot wake up Rafael J. Wysocki
2011-02-10 16:53 ` Rafael J. Wysocki [this message]
2011-02-10 20:48   ` Matt Carlson
2011-02-10 20:48   ` Matt Carlson
2011-02-10 21:08     ` Rafael J. Wysocki
2011-02-10 21:08     ` Rafael J. Wysocki
2011-02-11  0:00       ` Matt Carlson
2011-02-11  0:00       ` Matt Carlson
2011-02-10 16:54 ` [PATCH 2/3] atl1c: Do not call device_init_wakeup() in atl1c_probe() Rafael J. Wysocki
2011-02-10 16:54 ` Rafael J. Wysocki
2011-02-10 16:55 ` [PATCH 3/3] atl1: Do not use legacy PCI power management Rafael J. Wysocki
2011-02-10 16:55 ` Rafael J. Wysocki
2011-02-11 19:39 ` [PATCH 0/3] Net driver fixes related to " David Miller
2011-02-11 19:39 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201102101753.09504.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=chris.snook@gmail.com \
    --cc=davem@davemloft.net \
    --cc=jcliburn@gmail.com \
    --cc=jie.yang@atheros.com \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=mcarlson@broadcom.com \
    --cc=mchan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    --cc=thomas@fjellstrom.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.