From patchwork Wed Jul 1 23:27:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 29374 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 0CDA8B70F6 for ; Thu, 2 Jul 2009 09:28:15 +1000 (EST) Received: by ozlabs.org (Postfix) id EE187DDD1C; Thu, 2 Jul 2009 09:28:14 +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 7F90ADDD0C for ; Thu, 2 Jul 2009 09:28:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752297AbZGAX1v (ORCPT ); Wed, 1 Jul 2009 19:27:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751345AbZGAX1v (ORCPT ); Wed, 1 Jul 2009 19:27:51 -0400 Received: from qmta05.emeryville.ca.mail.comcast.net ([76.96.30.48]:54020 "EHLO QMTA05.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752504AbZGAX1u (ORCPT ); Wed, 1 Jul 2009 19:27:50 -0400 Received: from OMTA19.emeryville.ca.mail.comcast.net ([76.96.30.76]) by QMTA05.emeryville.ca.mail.comcast.net with comcast id AnTr1c0021eYJf8A5nTv8W; Wed, 01 Jul 2009 23:27:55 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA19.emeryville.ca.mail.comcast.net with comcast id AnTZ1c00234bfcX01nTcKA; Wed, 01 Jul 2009 23:27:53 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 1/6] e1000e: PHY loopback broken on 82578 To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Bruce Allan , Jeff Kirsher Date: Wed, 01 Jul 2009 16:27:31 -0700 Message-ID: <20090701232731.20555.63487.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bruce Allan PHY loopback on 82578 fails to work as a result of flushing the packets in the FIFO buffer in the link stall workaround. Don't perform the workaround if in PHY loopback mode. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher --- drivers/net/e1000e/defines.h | 2 ++ drivers/net/e1000e/phy.c | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) -- 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/e1000e/defines.h b/drivers/net/e1000e/defines.h index 8890c97..4329ec3 100644 --- a/drivers/net/e1000e/defines.h +++ b/drivers/net/e1000e/defines.h @@ -575,6 +575,8 @@ #define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */ #define PHY_EXT_STATUS 0x0F /* Extended Status Reg */ +#define PHY_CONTROL_LB 0x4000 /* PHY Loopback bit */ + /* NVM Control */ #define E1000_EECD_SK 0x00000001 /* NVM Clock */ #define E1000_EECD_CS 0x00000002 /* NVM Chip Select */ diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index e23459c..d845394 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c @@ -2737,6 +2737,11 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw) if (hw->phy.type != e1000_phy_82578) goto out; + /* Do not apply workaround if in PHY loopback bit 14 set */ + hw->phy.ops.read_phy_reg(hw, PHY_CONTROL, &data); + if (data & PHY_CONTROL_LB) + goto out; + /* check if link is up and at 1Gbps */ ret_val = hw->phy.ops.read_phy_reg(hw, BM_CS_STATUS, &data); if (ret_val)