From patchwork Mon May 26 13:40:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 352515 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 909B5140077 for ; Mon, 26 May 2014 23:42:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752645AbaEZNmb (ORCPT ); Mon, 26 May 2014 09:42:31 -0400 Received: from webbox1416.server-home.net ([77.236.96.61]:58897 "EHLO webbox1416.server-home.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752471AbaEZNm2 (ORCPT ); Mon, 26 May 2014 09:42:28 -0400 Received: from comm.systec-electronic.de (unknown [212.185.67.148]) by webbox1416.server-home.net (Postfix) with ESMTPA id AC6E927A67E; Mon, 26 May 2014 15:32:13 +0200 (CEST) Received: from ws-stein.systec-electronic.de (unknown [192.168.10.109]) by comm.systec-electronic.de (Postfix) with ESMTP id C381297C342; Mon, 26 May 2014 15:42:24 +0200 (CEST) From: Alexander Stein To: "David S. Miller" Cc: Daniel Krueger , netdev@vger.kernel.org, Alexander Stein Subject: [PATCH 5/6] pch_gbe: reset PHY before first configuration Date: Mon, 26 May 2014 15:40:38 +0200 Message-Id: <1401111639-11507-5-git-send-email-alexander.stein@systec-electronic.com> X-Mailer: git-send-email 1.8.5.5 In-Reply-To: <1401111639-11507-1-git-send-email-alexander.stein@systec-electronic.com> References: <1401111639-11507-1-git-send-email-alexander.stein@systec-electronic.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Krueger It is a good idea to perform a PHY software reset, but is should be done before performing the first configuration. Signed-off-by: Daniel Krueger Signed-off-by: Alexander Stein --- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c index 3fa9a8f..dc9f0d3 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c @@ -316,6 +316,8 @@ void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw) if (ret) netdev_err(adapter->netdev, "Error: mii_ethtool_gset\n"); + pch_gbe_phy_sw_reset(hw); + ethtool_cmd_speed_set(&cmd, hw->mac.link_speed); cmd.duplex = hw->mac.link_duplex; cmd.advertising = hw->phy.autoneg_advertised; @@ -324,8 +326,6 @@ void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw) if (ret) netdev_err(adapter->netdev, "Error: mii_ethtool_sset\n"); - pch_gbe_phy_sw_reset(hw); - pch_gbe_phy_read_reg_miic(hw, PHY_PHYSP_CONTROL, &mii_reg); mii_reg |= PHYSP_CTRL_ASSERT_CRS_TX; pch_gbe_phy_write_reg_miic(hw, PHY_PHYSP_CONTROL, mii_reg);