From patchwork Fri Nov 4 22:17:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 123708 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 A63ADB70C6 for ; Sat, 5 Nov 2011 09:17:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753998Ab1KDWRV (ORCPT ); Fri, 4 Nov 2011 18:17:21 -0400 Received: from mail.vyatta.com ([76.74.103.46]:42758 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753132Ab1KDWRU (ORCPT ); Fri, 4 Nov 2011 18:17:20 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 26C8D1410019; Fri, 4 Nov 2011 15:17:20 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id otrlfxLQooAn; Fri, 4 Nov 2011 15:17:18 -0700 (PDT) Received: from nehalam.linuxnetplumber.net (static-50-53-80-93.bvtn.or.frontiernet.net [50.53.80.93]) by mail.vyatta.com (Postfix) with ESMTPSA id 9F9191410013; Fri, 4 Nov 2011 15:17:18 -0700 (PDT) Date: Fri, 4 Nov 2011 15:17:17 -0700 From: Stephen Hemminger To: Pavel Mateja , David Miller Cc: netdev@vger.kernel.org Subject: [PATCH] sky2: fix regression on Yukon Optima Message-ID: <20111104151717.0f4666ac@nehalam.linuxnetplumber.net> In-Reply-To: <201110171434.50436.pavel@netsafe.cz> References: <201110171434.50436.pavel@netsafe.cz> Organization: Vyatta X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.6; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changes to support other Optima types, introduced an accidental regression that caused 88E8059 to come up in 10Mbit/sec. The Yukon Optima supports a reverse auto-negotiation feature that was incorrectly setup, and not needed. The feature could be used to allow wake-on-lan at higher speeds. But doing it correctly would require other changes to initialization. Reported-by: Pavel Mateja Signed-off-by: Stephen Hemminger --- This version is for current driver organization (post 3.1). Same fix applies but to drivers/net/sky2.c in -stable. -- 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 --- a/drivers/net/ethernet/marvell/sky2.c 2011-11-02 15:38:11.677011133 -0700 +++ b/drivers/net/ethernet/marvell/sky2.c 2011-11-04 15:01:51.310888300 -0700 @@ -366,17 +366,6 @@ static void sky2_phy_init(struct sky2_hw gm_phy_write(hw, port, PHY_MARV_FE_SPEC_2, spec); } } else { - if (hw->chip_id >= CHIP_ID_YUKON_OPT) { - u16 ctrl2 = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL_2); - - /* enable PHY Reverse Auto-Negotiation */ - ctrl2 |= 1u << 13; - - /* Write PHY changes (SW-reset must follow) */ - gm_phy_write(hw, port, PHY_MARV_EXT_CTRL_2, ctrl2); - } - - /* disable energy detect */ ctrl &= ~PHY_M_PC_EN_DET_MSK;