From patchwork Wed Jun 7 13:51:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 772436 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 3wjVMf64Vwz9sDb for ; Wed, 7 Jun 2017 23:51:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="F2Ddn447"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751651AbdFGNvV (ORCPT ); Wed, 7 Jun 2017 09:51:21 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34389 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbdFGNvT (ORCPT ); Wed, 7 Jun 2017 09:51:19 -0400 Received: by mail-wm0-f67.google.com with SMTP id 70so2694198wme.1 for ; Wed, 07 Jun 2017 06:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZBJom/aT6vWmfYvbI4RxDi7MS5HV4efFykgOPKLkiLk=; b=F2Ddn447/TvJyUbhAo44dpMuveHx10tmJkvq1HmnQemhoJ/GX4tHbXvjK6rJZkzZr1 9clKerjnSC0xwWEr4wzUzA9ADwbdj7tfWQ4aJt8CXH2aH8ix3iSh+SWpBvJOpguJqPxu rA1GaEB8DkKqG6wv/i3rpx71nx8TEjdEGQop1iBQtdX1N5CtCBtiRVIEw+FjSu10tvfz PuPGWsjper4AlSYDzQgyLBeCb59f0pOHeUAskFcEkmLFaXyOP1vSAsY0r0MhoLdteMOU IRxmx2xYPGnDxyLcyIQ+qVcGCwqg132BMMaAOiDQCNldARtLhL3LQBxzbKBFA1CP9HSE gCXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZBJom/aT6vWmfYvbI4RxDi7MS5HV4efFykgOPKLkiLk=; b=H+UfKqjpKYhDn+1yJJzBV/ZYxug9S9MPN0vI5D8PhwD2cYCRWcLLgdqoWwz81UpJ3U tfUN8qg13hvFhhFpkmTVz/auNzzi3uucSwALE52LPOr42pAyA2B9H3Oj0BWIRiPEVGwP 4US+0djAru4O17uy2cwyxQwstxC18HCzak/bf72Cxyb4GgU1MYJ2scjtgEUmlzWTs/Tf pyYZrYsI09l1uGwjcy4vUNPbp9Ms4TgC6vHjNCFPclGBMy+2G8sGLtMWqDhTXODVpj+C VjOY5hdcN4Kve8sVGf06wJRicacsA3sy7Szj2wqOIcbNxkn/0835Kr0nZEnJdut9qMxF /+Hg== X-Gm-Message-State: AKS2vOwlhC2cpF9dvrPumxP/L8w9VYmShro4eTPDyZythgEN3J56uwN+ mZBeadlXUdFXQJGK X-Received: by 10.28.18.72 with SMTP id 69mr2344109wms.37.1496843477768; Wed, 07 Jun 2017 06:51:17 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC1BBFCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbc1:bbfc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id e24sm2235960wre.54.2017.06.07.06.51.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Jun 2017 06:51:17 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1dIbMi-0000Vd-9t; Wed, 07 Jun 2017 15:51:16 +0200 From: Christian Lamparter To: netdev@vger.kernel.org Cc: "David S . Miller" , Ivan Mikhaylov , Russell Senior , Andrew Lunn , Chris Blake Subject: [PATCH v2 1/2] net: emac: fix reset timeout with AR8035 phy Date: Wed, 7 Jun 2017 15:51:15 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a problem where the AR8035 PHY can't be detected on an Cisco Meraki MR24, if the ethernet cable is not connected on boot. Russell Senior provided steps to reproduce the issue: |Disconnect ethernet cable, apply power, wait until device has booted, |plug in ethernet, check for interfaces, no eth0 is listed. | |This appears to be a problem during probing of the AR8035 Phy chip. |When ethernet has no link, the phy detection fails, and eth0 is not |created. Plugging ethernet later has no effect, because there is no |interface as far as the kernel is concerned. The relevant part of |the boot log looks like this: |this is the failing case: | |[ 0.876611] /plb/opb/emac-rgmii@ef601500: input 0 in RGMII mode |[ 0.882532] /plb/opb/ethernet@ef600c00: reset timeout |[ 0.888546] /plb/opb/ethernet@ef600c00: can't find PHY! |and the succeeding case: | |[ 0.876672] /plb/opb/emac-rgmii@ef601500: input 0 in RGMII mode |[ 0.883952] eth0: EMAC-0 /plb/opb/ethernet@ef600c00, MAC 00:01:.. |[ 0.890822] eth0: found Atheros 8035 Gigabit Ethernet PHY (0x01) Based on the comment and the commit message of commit 23fbb5a87c56 ("emac: Fix EMAC soft reset on 460EX/GT"). This is because the AR8035 PHY doesn't provide the TX Clock, if the ethernet cable is not attached. This causes the reset to timeout and the PHY detection code in emac_init_phy() is unable to detect the AR8035 PHY. As a result, the emac driver bails out early and the user left with no ethernet. In order to stay compatible with existing configurations, the driver tries the current reset approach at first. Only if the first attempt timed out, it does perform one more retry with the clock temporarily switched to the internal source for just the duration of the reset. LEDE-Bug: #687 Cc: Chris Blake Reported-by: Russell Senior Fixes: 23fbb5a87c56e98 ("emac: Fix EMAC soft reset on 460EX/GT") Signed-off-by: Christian Lamparter Reviewed-by: Andrew Lunn --- v1 -> v2: - made it clear, that the clock source is only switched temporarily. - fixed missing goto label, if !CONFIG_PPC_DCR_NATIVE --- drivers/net/ethernet/ibm/emac/core.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 508923f39ccf..b6e871bfb659 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -343,6 +343,7 @@ static int emac_reset(struct emac_instance *dev) { struct emac_regs __iomem *p = dev->emacp; int n = 20; + bool __maybe_unused try_internal_clock = false; DBG(dev, "reset" NL); @@ -355,6 +356,7 @@ static int emac_reset(struct emac_instance *dev) } #ifdef CONFIG_PPC_DCR_NATIVE +do_retry: /* * PPC460EX/GT Embedded Processor Advanced User's Manual * section 28.10.1 Mode Register 0 (EMACx_MR0) states: @@ -362,10 +364,19 @@ static int emac_reset(struct emac_instance *dev) * of the EMAC. If none is present, select the internal clock * (SDR0_ETH_CFG[EMACx_PHY_CLK] = 1). * After a soft reset, select the external clock. + * + * The AR8035-A PHY Meraki MR24 does not provide a TX Clk if the + * ethernet cable is not attached. This causes the reset to timeout + * and the PHY detection code in emac_init_phy() is unable to + * communicate and detect the AR8035-A PHY. As a result, the emac + * driver bails out early and the user has no ethernet. + * In order to stay compatible with existing configurations, the + * driver will temporarily switch to the internal clock, after + * the first reset fails. */ if (emac_has_feature(dev, EMAC_FTR_460EX_PHY_CLK_FIX)) { - if (dev->phy_address == 0xffffffff && - dev->phy_map == 0xffffffff) { + if (try_internal_clock || (dev->phy_address == 0xffffffff && + dev->phy_map == 0xffffffff)) { /* No PHY: select internal loop clock before reset */ dcri_clrset(SDR0, SDR0_ETH_CFG, 0, SDR0_ETH_CFG_ECS << dev->cell_index); @@ -383,8 +394,15 @@ static int emac_reset(struct emac_instance *dev) #ifdef CONFIG_PPC_DCR_NATIVE if (emac_has_feature(dev, EMAC_FTR_460EX_PHY_CLK_FIX)) { - if (dev->phy_address == 0xffffffff && - dev->phy_map == 0xffffffff) { + if (!n && !try_internal_clock) { + /* first attempt has timed out. */ + n = 20; + try_internal_clock = true; + goto do_retry; + } + + if (try_internal_clock || (dev->phy_address == 0xffffffff && + dev->phy_map == 0xffffffff)) { /* No PHY: restore external clock source after reset */ dcri_clrset(SDR0, SDR0_ETH_CFG, SDR0_ETH_CFG_ECS << dev->cell_index, 0);