From patchwork Thu Dec 7 14:27:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10099307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 51F1660325 for ; Thu, 7 Dec 2017 14:29:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42F2828CC8 for ; Thu, 7 Dec 2017 14:29:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3633928D19; Thu, 7 Dec 2017 14:29:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D61528CC8 for ; Thu, 7 Dec 2017 14:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=4mZ75qST7fimtrUHDr9z7EdS0SZr18n9lBQ7xQHGBbk=; b=i05AxKzWERXKC4bpF3M6De2BwG v/l1Sa7i0pmKsGTuT5i4+QFnn86LwZy3/Ul8G6FzeZCRjYbDLNt08vfozJlSJxsFKVHzRMVgPlLYc 2Lf01AF5Whpav+mR3samXrwoBzS4f9ag5rU12VmLztXqBhqY5YaZ9ikG8hYJkQyLAxRMmOx8fiTWs EM9rvIQU01prWOE+kNk5F/Kc1XtQpA3R5KHhfS4kC1Hz0LABAw6KKqQ8W5uUE+ZgFU5knSm2qb2j+ iWtUOoffl38Apwcx/Y/gZMverN5BoF+Tlcwgs1KrrJruEQcLyfIoR9IXYqVxwGtfA/4BBQkVpHGO9 A7e9/MXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMxBC-0006Xx-JZ; Thu, 07 Dec 2017 14:29:38 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMx9N-0004mp-8Y for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 14:28:03 +0000 Received: by mail-wm0-x22f.google.com with SMTP id r78so13446996wme.5 for ; Thu, 07 Dec 2017 06:27:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3UvWykb2FP/peh9qpSptmY33mHqvfp6epBds5Tj7ys0=; b=I0vGMvU1t7Nn4gBUTW+g7CAzedHuwBRgusg/VYotfFt/ggHUEo47dXOS4iwu90Nj/Z NHEssRJB68aFTf0+8L58DOuM2zifuH8zFY1u/y+kTxza82rzCKvexbqEiFFneSbh2Fss cgLr8k2bvLfjWJ7atx2hqlYOUOr+ryEljhpEM0hlZUWY2CUtPK9wHR5XojgG19IeJTTT /aSYRTlB/ly2IJl36dvwddFrM/QnTPpwKLc2SUwcwVNTXBhMDC4lapTPzzG7lwfe4rIW 51SnAAamO6xD0BEpriRNf0XpxK4IPY8hBuHqSVuNC6M+A+cP5ScZfhG40DBY6ps7/MG1 u2WA== 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:in-reply-to :references; bh=3UvWykb2FP/peh9qpSptmY33mHqvfp6epBds5Tj7ys0=; b=VR7ao+Qx0UyRzQ/eIwHe/NSp7mVMlML9ehf6Uo8C+3vGJYoJlr5/UfN28LMeWtJ4kK HxjCQ1OxZ/zacHMhWgAeVljyOSuT6SMu/aq4RhZ7YYvY/HQLblNQaHDV5ziLYp9QUKfz SvJ1jL8032Wnwy+/E4EN+ZtWDCSHRrwRU0ff+Zfm/AlSf0b5KLwyBRyqaMqJAsCbaTTF cJ8MAyJYDT7OEobZFFX3kZ0M931s16xG+r3yLWQooCDlZcXWSN2SOHBwWoVrrsL3RJ2r LI1BcCKOkdOCn1oZmRLG1ZNBMrj8eqHSohgpyPNvFpwiX0dKRFUiutADOKsYEEAx14sq fCuA== X-Gm-Message-State: AKGB3mIPChg7/YnE8b9Em9DzaG9b4FxJdwPZmdjdYIpwoxcZv0WIEkAC LR1OmAVGmILoi2w+b8oKQ94PsA== X-Google-Smtp-Source: AGs4zMa1l6YA9Mndg+e2L3El8dubxMIyckhUo5lBmoQHnzDNZNR1Vf2OC0AEOk1QTIMPU7nmno5ccg== X-Received: by 10.28.26.139 with SMTP id a133mr1314607wma.90.1512656843152; Thu, 07 Dec 2017 06:27:23 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id t138sm6264520wme.16.2017.12.07.06.27.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Dec 2017 06:27:22 -0800 (PST) From: Jerome Brunet To: Andrew Lunn , Florian Fainelli Subject: [PATCH net-next v2 5/8] net: phy: meson-gxl: detect LPA corruption Date: Thu, 7 Dec 2017 15:27:12 +0100 Message-Id: <20171207142715.32578-6-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171207142715.32578-1-jbrunet@baylibre.com> References: <20171207142715.32578-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_062745_645631_DB1A1009 X-CRM114-Status: GOOD ( 26.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The purpose of this change is to fix the incorrect detection of the link partner (LP) advertised capabilities which sometimes happens with this PHY (roughly 1 time in a dozen) This issue may cause the link to be negotiated at 10Mbps/Full or 10Mbps/Half when 100MBps/Full is actually possible. In some case, the link is even completely broken and no communication is possible. To detect the corruption, we must look for a magic undocumented bit in the WOL bank (hint given by the SoC vendor kernel) but this is not enough to cover all cases. We also have to look at the LPA ack. If the LP supports Aneg but did not ack our base code when aneg is completed, we assume something went wrong. The detection of a corrupted LPA triggers a restart of the aneg process. This solves the problem but may take up to 6 retries to complete. Fixes: 7334b3e47aee ("net: phy: Add Meson GXL Internal PHY driver") Signed-off-by: Jerome Brunet --- I suppose this patch probably seems a bit hacky, especially the part about the link partner acknowledge. I'm trying to figure out if the value in MII_LPA makes sense but I don't have such a deep knowledge of the ethernet spec. To me, it does not makes sense for the LP to support ANEG (Bit 1 in MII_EXPENSION), the aneg to have successfully complete and, at the same time, LP does not ACK our base code word, which we should have sent during this aneg. If you think this may have unintended consequences or if you have an idea to this differently, feel free to let me know. drivers/net/phy/meson-gxl.c | 59 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 2e8c40df33c2..726e0eeed475 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -35,11 +35,16 @@ #define TSTWRITE 23 #define BANK_ANALOG_DSP 0 +#define BANK_WOL 1 #define BANK_BIST 3 /* Analog/DSP Registers */ #define A6_CONFIG_REG 0x17 +/* WOL Registers */ +#define LPI_STATUS 0xc +#define LPI_STATUS_RSV12 BIT(12) + /* BIST Registers */ #define FR_PLL_CONTROL 0x1b #define FR_PLL_DIV0 0x1c @@ -145,6 +150,58 @@ static int meson_gxl_config_init(struct phy_device *phydev) return genphy_config_init(phydev); } +/* This specific function is provided to cope with the possible failures of + * this phy during aneg process. When aneg fails, the PHY reports that aneg + * is done but the value found in MII_LPA is wrong: + * - Early failures: MII_LPA is just 0x0001. if MII_EXPANSION reports that + * the link partner (LP) supports aneg but the LP never acked our base + * code word, it is likely that we never sent it to begin with. + * - Late failures: MII_LPA is filled with a value which seems to make sense + * but it actually is not what the LP is advertising. It seems that we + * can detect this using a magic bit in the WOL bank (reg 12 - bit 12). + * If this particular bit is not set when aneg is reported being done, + * it means MII_LPA is likely to be wrong. + * + * In both case, forcing a restart of the aneg process solve the problem. + * When this failure happens, the first retry is usually successful but, + * in some cases, it may take up to 6 retries to get a decent result + */ +int meson_gxl_read_status(struct phy_device *phydev) +{ + int ret, wol, lpa, exp; + + if (phydev->autoneg == AUTONEG_ENABLE) { + ret = genphy_aneg_done(phydev); + if (ret < 0) + return ret; + else if (!ret) + goto read_status_continue; + + /* Aneg is done, let's check everything is fine */ + wol = meson_gxl_read_reg(phydev, BANK_WOL, LPI_STATUS); + if (wol < 0) + return wol; + + lpa = phy_read(phydev, MII_LPA); + if (lpa < 0) + return lpa; + + exp = phy_read(phydev, MII_EXPANSION); + if (exp < 0) + return exp; + + if (!(wol & LPI_STATUS_RSV12) || + ((exp & EXPANSION_NWAY) && !(lpa & LPA_LPACK))) { + /* Looks like aneg failed after all */ + phydev_dbg(phydev, "LPA corruption - aneg restart\n"); + return genphy_restart_aneg(phydev); + } + } + +read_status_continue: + return genphy_read_status(phydev); +} + static struct phy_driver meson_gxl_phy[] = { { .phy_id = 0x01814400, @@ -155,7 +212,7 @@ static struct phy_driver meson_gxl_phy[] = { .config_init = meson_gxl_config_init, .config_aneg = genphy_config_aneg, .aneg_done = genphy_aneg_done, - .read_status = genphy_read_status, + .read_status = meson_gxl_read_status, .suspend = genphy_suspend, .resume = genphy_resume, },