From mboxrd@z Thu Jan 1 00:00:00 1970 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 A34FDC43381 for ; Sat, 16 Feb 2019 19:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70A3A21A4C for ; Sat, 16 Feb 2019 19:53:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KFJTv3a2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733022AbfBPTxt (ORCPT ); Sat, 16 Feb 2019 14:53:49 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36745 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729933AbfBPTxs (ORCPT ); Sat, 16 Feb 2019 14:53:48 -0500 Received: by mail-wm1-f66.google.com with SMTP id j125so12996630wmj.1 for ; Sat, 16 Feb 2019 11:53:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=+qgcaAbriZ6x/+XqIy8cy/HsrwLUUIXK0n91ZG44flY=; b=KFJTv3a2V/SIpig72rLzaV69xs81ou7noRCksPzWNA9DBGD5q92VG3Hyz5M59lMi6a Tp/905aCnKLJKiWx5tEdoQgxMDp2HLxCTcCqKjo/zizkcYXvgpxO56wkpe1emNEbUccY nxwqabwGGOXNobYtWiSSDEgRgJP6fIPDJIf0Kika2gM5tCslu+ub2hwJQURHpS2pDvAO NEBmssHuYUwMSvvHvypAjcsrywtNETQpaR05RTApZ1Bpvk8fEjJVciX/zj9N9ItoVLz9 EPSrwt5FB+3VvHv5x2wnd/oc1hwvYyRlTBxLetP68ikfdGUkc2CdmAdMAG6aRQNbysOy RqXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+qgcaAbriZ6x/+XqIy8cy/HsrwLUUIXK0n91ZG44flY=; b=YThgVMw+1qXwNKp2zxsZJnCmtF5jbfo5MT3Gko/0bslunt9bOzHvNeSqqXsgQ1vXMd b9fS9KmiiSqqn/J1NWrGBgc7jqQF3zhPEVEr9ATKbmbDFS9FLyvsAWKEYbajGasZ9K9Q iIgnfIpyIiRwBtcY1O334GcuuyLsDEOQZ/18pqkJsqruLFAY4WokU/MyBPhoDSGNAbRL kbqTvbq8kBLG24PpYkZxZW46E6i1wQgkQ1jV5NZkiC9lhjHi6oJpa7Yin15jpDsWEduR 99pfwCpE0H/KhhgYudei/WHk3lZB/LgndqwQPkFljmo3mCrGUvsDuOsw6DI/rd0Yi4mx X8Ig== X-Gm-Message-State: AHQUAuajMhonPGzjda2wr1HP1xDvgXVbLW+6RiFNqUNdUVMxmy4g0OpV Gx2+vRp4aDT99yJX2GkRlZOmTl1r X-Google-Smtp-Source: AHgI3IZiP3+t10cy8kfo16pDsjXOscu754jLiTJeiEmi2pxRd65xAZ0o1sPoen/wDah2LBHxm8qHpA== X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr10072203wmc.123.1550346825148; Sat, 16 Feb 2019 11:53:45 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:fc50:d076:bfa9:dffa? (p200300EA8BF1E200FC50D076BFA9DFFA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:fc50:d076:bfa9:dffa]) by smtp.googlemail.com with ESMTPSA id m26sm4198468wmg.13.2019.02.16.11.53.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 11:53:44 -0800 (PST) Subject: [PATCH net-next 4/4] net: phy: marvell10g: check for newly set aneg in mv3310_config_aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com> Message-ID: <249c09b1-e4b2-6d72-b0cc-018fef336a4b@gmail.com> Date: Sat, 16 Feb 2019 20:53:29 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com> 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 Even if the advertisement registers content didn't change, we may have just switched to aneg, and therefore have to trigger an aneg restart. This matches the behavior of genphy_config_aneg(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 03fa50087..4d8a290eb 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -288,6 +288,16 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (ret > 0) changed = true; + if (!changed) { + /* Configure and restart aneg if it wasn't set before */ + ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1); + if (ret < 0) + return ret; + + if (!(ret & MDIO_AN_CTRL1_ENABLE)) + changed = 1; + } + if (changed) ret = genphy_c45_restart_aneg(phydev); -- 2.20.1