From patchwork Fri Dec 8 11:08:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10102343 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 25040602A0 for ; Fri, 8 Dec 2017 11:09:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03D6E28B38 for ; Fri, 8 Dec 2017 11:09:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECD4C28B3D; Fri, 8 Dec 2017 11:09:21 +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 6607428B38 for ; Fri, 8 Dec 2017 11:09:21 +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: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:In-Reply-To: References:List-Owner; bh=9532TNBFuJs++iUm5mMEMqW9XqpgWs788sT+IO+9f3k=; b=MzD l20gVPprQrtsTJ87SQZDOBEKXw0uzipgJ2ZiRApCXdDl5O/EuW7XhxyVBzpJ1CCgDUXc3+mDh4dKO AJh8/1+mVsTN7zG9TXNPX9xxULyyWLxCG9g4D5cDxos9FNxbi7J2yLTJSLXfZH4nZeu7k0l7vtMIh GFw+JrZFp6GkYIEPS5hlotAp0aRuJw0WjfNX1+BETL4bkK7EH8zNNf00bPamaDfL9eWy/QOp5Wm4i FUo0F1zqX/+7ES/pTVLg8S/zZWEIPZyMrEWvteJzwi82XVwLQtx4j6zSLaKDGRflEcAsu4M8f3qlK 3+JDVooemjVD8xsVGICbcmC9rosAjBA==; 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 1eNGWl-0000MM-1a; Fri, 08 Dec 2017 11:09:11 +0000 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eNGWM-0008Iy-KV for linux-amlogic@lists.infradead.org; Fri, 08 Dec 2017 11:08:51 +0000 Received: by mail-wr0-x236.google.com with SMTP id v105so10468236wrc.3 for ; Fri, 08 Dec 2017 03:08: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; bh=WNuQZ32N5f0xtqUmmNLi8+lIrAawdc/4v90ElwSGS/A=; b=d7TYE/gDSwf42cs3QJZAkVZx1Gg3b53cqFPx7RC9MmLSIbv41t/24mC7wwhObLEovg zOb7apomzRH3Fi5vGruAfzunIjQtLdj/VK3Tj/t8Cz+2/jT4vf06Ckpw+JC8+y4o41nb dKoUx+BO7WwbHxS4lBNo3bcfl7QdGG5NA7Z2AvYKN7oY4umu3OsbW1mcEXJKQtdSmLFd V3sdB1ErSaZXdKH6rLOMO7VOl1dV6B7FuRZN4lt5xhrSVus8sofRyjfCJSqshhSfttr+ Cb/fMbvlDOcfoe5gvvbHOxJxvr6IwFSrp6r2rMwMk01ZQogWcx4Qf49AIhfUs+RMiI4W gGWg== 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=WNuQZ32N5f0xtqUmmNLi8+lIrAawdc/4v90ElwSGS/A=; b=CWfQy4Sem5486WTTJwYa1ROgdfcerUBXQcT7rk5vZccsKSU4XAOQBFlhZgPGt5zOPE 7D543c3edCVfSoidnzAcfqV9hjqHsclJ0O8MhVybriHr+JiBo0ICIAk/5t7JGOEnTjxF SgA/EuSBMP7y4hewbOmPdzyL79K0aq9pHEZM+dYueqvKeybI96y9syWFaZiZg3cpH0ws FhMqlW4mnbxxw514ww60DxR2U402PQ3W55ItyziHNN/Gl0N/HNq106g49U/DPp8hhSQR EILobueqbZi9Q1lXzKIC1S/fMB7gfiPnyLlSlqMi/0pu791NnBHQGBAIHuITULUwHrJz EpIA== X-Gm-Message-State: AJaThX4WXFFMF5hMzvWs4J5m9yIonpdr/d+OvcRD3jYB3QGscKkP78Ax +3BCTGTejHPbPHQnR1OdF21ecw== X-Google-Smtp-Source: AGs4zMZMVdNS3/J7YWQVRhSVo2R45NUAwMgBitC8jrGVdBLHStq9xf3NLCHJbTCeBivql4XVtVg41Q== X-Received: by 10.223.184.173 with SMTP id i42mr28003573wrf.31.1512731301876; Fri, 08 Dec 2017 03:08:21 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id q15sm8091009wra.91.2017.12.08.03.08.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Dec 2017 03:08:21 -0800 (PST) From: Jerome Brunet To: Andrew Lunn , Florian Fainelli Subject: [PATCH net v3] net: phy: meson-gxl: detect LPA corruption Date: Fri, 8 Dec 2017 12:08:11 +0100 Message-Id: <20171208110811.30789-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171208_030846_867427_A692E223 X-CRM114-Status: GOOD ( 25.22 ) X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=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 do this differently, feel free to let me know. This fix has been tested on the libretech-cc and khadas VIM The v2 [0] had dependencies on other changes which were not fixes. This v3 is re-implementation of v2 without the dependencies to be merged as a fix and easily backportable. All the ugly phy_write() with hexadecimal values will go away when then clean-up gets through. [0]: https://lkml.kernel.org/r/20171207142715.32578-6-jbrunet@baylibre.com drivers/net/phy/meson-gxl.c | 74 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 1ea69b7585d9..700007dd4be5 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -22,6 +22,7 @@ #include #include #include +#include static int meson_gxl_config_init(struct phy_device *phydev) { @@ -50,6 +51,77 @@ static int meson_gxl_config_init(struct phy_device *phydev) return 0; } +/* This 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; + + /* Need to access WOL bank, make sure the access is open */ + ret = phy_write(phydev, 0x14, 0x0000); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0400); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0000); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0400); + if (ret) + return ret; + + /* Request LPI_STATUS WOL register */ + ret = phy_write(phydev, 0x14, 0x8D80); + if (ret) + return ret; + + /* Read LPI_STATUS value */ + wol = phy_read(phydev, 0x15); + 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 & BIT(12)) || + ((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, @@ -60,7 +132,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, },