Patchwork [net-next,2/5] bnx2: Restrict WoL support.

login
register
mail settings
Submitter Michael Chan
Date Nov. 12, 2008, 11:10 p.m.
Message ID <1226531404-26118-2-git-send-email-mchan@broadcom.com>
Download mbox | patch
Permalink /patch/8465/
State Accepted
Delegated to: David Miller
Headers show

Comments

Michael Chan - Nov. 12, 2008, 11:10 p.m.
On some quad-port cards that cannot support WoL on all ports due
to excessive power consumption, the driver needs to restrict WoL
on some ports by checking VAUX_PRESET bit.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
---
 drivers/net/bnx2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
David Miller - Nov. 13, 2008, 12:01 a.m.
From: "Michael Chan" <mchan@broadcom.com>
Date: Wed, 12 Nov 2008 15:10:01 -0800

> On some quad-port cards that cannot support WoL on all ports due
> to excessive power consumption, the driver needs to restrict WoL
> on some ports by checking VAUX_PRESET bit.
> 
> Signed-off-by: Michael Chan <mchan@broadcom.com>
> Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
> Signed-off-by: Benjamin Li <benli@broadcom.com>

Applied.
--
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

Patch

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 49ebb50..d28cbce 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7586,7 +7586,8 @@  bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
 	if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
 	    (CHIP_ID(bp) == CHIP_ID_5708_B0) ||
-	    (CHIP_ID(bp) == CHIP_ID_5708_B1)) {
+	    (CHIP_ID(bp) == CHIP_ID_5708_B1) ||
+	    !(REG_RD(bp, BNX2_PCI_CONFIG_3) & BNX2_PCI_CONFIG_3_VAUX_PRESET)) {
 		bp->flags |= BNX2_FLAG_NO_WOL;
 		bp->wol = 0;
 	}