Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BBA8C10F11 for ; Wed, 24 Apr 2019 19:41:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C4922183E for ; Wed, 24 Apr 2019 19:41:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i/NMxNQh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727957AbfDXTlQ (ORCPT ); Wed, 24 Apr 2019 15:41:16 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40344 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727423AbfDXTlP (ORCPT ); Wed, 24 Apr 2019 15:41:15 -0400 Received: by mail-wm1-f65.google.com with SMTP id z24so6761237wmi.5 for ; Wed, 24 Apr 2019 12:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=ZoykqKObcKRorGtHcJTH0Up7uvC+DoaKf5xPa067+2c=; b=i/NMxNQh/Fgf8+y+bc9kzihbxLVm8jTYgnj3D6SoPZzvHetATyK6pgnAZvYI1qXvRH qqJUwJMKmyMhE+nj3k3aRhKvxfJXyZ5HqVRWRQFvWyiHTnrYEVf2PtasGMaeYUHYj+QW RWYiUBIa31hteEr87yIfrG5gFNFDAyKjag8SR/x3kuSo3Gf/RRPiQsCXtycYy+msBO6c xUlhwOpV/ZbDog3ljSohMcXYxjxgTgqy1FIgVtpcLrquXrmQBsdgYdc/KBBfnMyfEaBO nyWwaWCqfW4yLyAw8+Fc+SXXFY03FZTQaoWroAE1mR2w0N4K95CfJDZh/6Er5hwB5Af3 CYzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=ZoykqKObcKRorGtHcJTH0Up7uvC+DoaKf5xPa067+2c=; b=VNWUBgpCQP0JoqGtjhDr4NF30j5Jq5AC5ma3+cbt6l7RJ89XkRoGsRNzXDEx6AzdHL +0T6niGdNJWTReZDP8iArUUnjtbWuywrMnaw95W0D2FJZ94uv9RQL+G2v4Je0XLu5koG BjGLEcTo8Ezy2TML3dWppWx4sBlsuXGymoMARMgyNsYGSKkp2/eugeVnPtVbUgUD6QFT iVRW+niXdA8YW+yfPtyAGcYhTsLEoo7I47ufAqKVx0ve2oCanCSXsw+mU5sSCT3YyWdL oxLWSfoujkFktp9pWaDtphpnADcJsBgaES8NfuoomVMGuUaLKENVz4Fi9WE+B3anG1+S bTcQ== X-Gm-Message-State: APjAAAVxPkedYDWKpgu4DaL//SK9fhJsvK+M56vwhLSmdc1iF6ql/Y7n PRFdz8Ddwx6d7m9ejZlFRUqVdcKI0dA= X-Google-Smtp-Source: APXvYqzCDEVUfwB5DiB4ofGFrhi0B8z3ciliBAAUy7p6gPuYPYYAUqyRcCXpDwQS2Tr7mrE33P/ZRg== X-Received: by 2002:a7b:ca49:: with SMTP id m9mr501919wml.61.1556134873621; Wed, 24 Apr 2019 12:41:13 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:5700:c498:ee8f:ff0a:13e5? (p200300EA8BD45700C498EE8FFF0A13E5.dip0.t-ipconnect.de. [2003:ea:8bd4:5700:c498:ee8f:ff0a:13e5]) by smtp.googlemail.com with ESMTPSA id p6sm18148233wrs.6.2019.04.24.12.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 12:41:12 -0700 (PDT) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] net: phy: improve genphy_soft_reset Message-ID: <9d703dbf-7be0-d4aa-57e2-8e45da5f7cd2@gmail.com> Date: Wed, 24 Apr 2019 21:41:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org PHY's behave differently when being reset. Some reset registers to defaults, some don't. Some trigger an autoneg restart, some don't. So let's also set the autoneg restart bit when resetting. Then PHY behavior should be more consistent. Clearing BMCR_ISOLATE serves the same purpose and is borrowed from genphy_restart_aneg. BMCR holds the speed / duplex settings in fixed mode. Therefore we may have an issue if a soft reset resets BMCR to its default. So better call genphy_setup_forced() afterwards in fixed mode. We've seen no related complaint in the last >10 yrs, so let's treat it as an improvement. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index b9192ae92..f794ff3a1 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1815,13 +1815,25 @@ EXPORT_SYMBOL(genphy_read_status); */ int genphy_soft_reset(struct phy_device *phydev) { + u16 res = BMCR_RESET; int ret; - ret = phy_set_bits(phydev, MII_BMCR, BMCR_RESET); + if (phydev->autoneg == AUTONEG_ENABLE) + res |= BMCR_ANRESTART; + + ret = phy_modify(phydev, MII_BMCR, BMCR_ISOLATE, res); if (ret < 0) return ret; - return phy_poll_reset(phydev); + ret = phy_poll_reset(phydev); + if (ret) + return ret; + + /* BMCR may be reset to defaults */ + if (phydev->autoneg == AUTONEG_DISABLE) + ret = genphy_setup_forced(phydev); + + return ret; } EXPORT_SYMBOL(genphy_soft_reset); -- 2.21.0