From patchwork Wed Nov 12 23:10:01 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 8465 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 43C18DDDED for ; Thu, 13 Nov 2008 10:03:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259AbYKLXDs (ORCPT ); Wed, 12 Nov 2008 18:03:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753168AbYKLXDr (ORCPT ); Wed, 12 Nov 2008 18:03:47 -0500 Received: from mms2.broadcom.com ([216.31.210.18]:1800 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751608AbYKLXDr (ORCPT ); Wed, 12 Nov 2008 18:03:47 -0500 Received: from [10.11.16.99] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 12 Nov 2008 15:03:34 -0800 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id EEBBC2B1; Wed, 12 Nov 2008 15:03:33 -0800 (PST) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id C1E822B0; Wed, 12 Nov 2008 15:03:33 -0800 (PST) Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with ESMTP id HHG04189; Wed, 12 Nov 2008 15:03:32 -0800 (PST) Received: from dell (dhcp-10-12-136-135.broadcom.com [10.12.136.135]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 59CD774D00; Wed, 12 Nov 2008 15:03:32 -0800 (PST) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org, "Michael Chan" , "Matt Carlson" , "Benjamin Li" Subject: [PATCH net-next 2/5] bnx2: Restrict WoL support. Date: Wed, 12 Nov 2008 15:10:01 -0800 Message-ID: <1226531404-26118-2-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1226531404-26118-1-git-send-email-mchan@broadcom.com> References: <1226531404-26118-1-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6505BF4C3FC16569160-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li --- drivers/net/bnx2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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; }