From patchwork Mon May 26 13:40:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 352518 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 6AF801400CF for ; Mon, 26 May 2014 23:42:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752606AbaEZNma (ORCPT ); Mon, 26 May 2014 09:42:30 -0400 Received: from webbox1416.server-home.net ([77.236.96.61]:58895 "EHLO webbox1416.server-home.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbaEZNm2 (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 A197127A67C; 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 B0CFF97C340; 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 3/6] pch_gbe: change order of PHY address discovering Date: Mon, 26 May 2014 15:40:36 +0200 Message-Id: <1401111639-11507-3-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 Scan PHY address 0 after all other addresses. Address 0 is a multicast address which unfortunately does not work properly with Micrel KSZ9021. Our board uses PHY address 2. Signed-off-by: Daniel Krueger Signed-off-by: Alexander Stein --- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 693ee50..52e6cbd 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -662,9 +662,9 @@ static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter) u32 addr; u16 bmcr, stat; - /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */ + /* Discover phy addr by searching addrs in order {1,2,...,31,0} */ for (addr = 0; addr < PCH_GBE_PHY_REGS_LEN; addr++) { - adapter->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr; + adapter->mii.phy_id = (addr == 31) ? 0 : (addr + 1); bmcr = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMCR); stat = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMSR); stat = pch_gbe_mdio_read(netdev, adapter->mii.phy_id, MII_BMSR);