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 A24DEC10F06 for ; Sun, 17 Feb 2019 08:41:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 730C821900 for ; Sun, 17 Feb 2019 08:41:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nhCe2dE/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbfBQIlw (ORCPT ); Sun, 17 Feb 2019 03:41:52 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39473 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726700AbfBQIlu (ORCPT ); Sun, 17 Feb 2019 03:41:50 -0500 Received: by mail-wm1-f65.google.com with SMTP id z84so6735438wmg.4 for ; Sun, 17 Feb 2019 00:41:49 -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=sAcLlY/bRN4lQqAoOieSjee4DeX3MpPRgKZwso96msY=; b=nhCe2dE/PYHvh1MNs3V5NXcQJCJU1BA6cXObbX1Lddaa/QEYkm3Ngzfc2eNh2t4ceb VdP/Q1J51qxc+SZ5X2XxP8Wl+cKKF178eo62sqOd2cGXhh7y6+GE1KhChjPWuapn7N8I 8Fn8cWocecBC85J3O84SRZsapGMTT0+d2eVigY26NPJQnbt+jPw6lD6yLe2rPH/QhB8r xJ+Jz4cJ+aXeKrxZKMm044cgpVKWS4CfoyrrTDa1S/f4iTQyDl2cohdMC+atdZXZPjCn pN375Hozj7BHznJ6SXUxXKzlKdW5EM0mBzV/07kBuQpaG+66isclP5Tt4Z3OmGwFSNde 1BQA== 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=sAcLlY/bRN4lQqAoOieSjee4DeX3MpPRgKZwso96msY=; b=POBchvkAXipB16Ili3iIf0eP51sk0pTOK9KAssBjU8dtwyXDm9CkRN+EuHuG4lraEC XYy5LSXQ42W+RM4VwWIeG70waoL1WWImJ5WRcjD8Wf4J+sx1sR2t1HQRwA07gfIrCMek AmC36jDZzzwjIAKcSoij1UbRXAsqG7dCX8XX2W2QC7gf8jqaRW31IffVZe40utbz55/4 Vbp2Oq4bnhf3N1tCTFHY09TAUPbPIbkYSwRsBNl4QzMEhsT8r2PmCjC+ArccRhU35WIv gXk+NdT+zUkUxDAuCipdZ8CKeOi7c/4GmEvl6PWutJwtaSa8PqfJzsyHZM0muY+9MkGs Mrdg== X-Gm-Message-State: AHQUAubnZP5McB43k2lHEvLu2sQGVje0F+PYxQzbnAO4tk3SbeF6irML WAth7vHfcdVNtwciZ8BjqaEoR79L X-Google-Smtp-Source: AHgI3IZNLLTyUmk+dq6WJbpoZZJojeGPdpN7K+F0sMfZ3Sm73AE0xY7A1g7EDg1c3FzcpX8/G85JRg== X-Received: by 2002:a1c:dc8a:: with SMTP id t132mr2417801wmg.48.1550392908342; Sun, 17 Feb 2019 00:41:48 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:4c36:c930:69b6:c10f? (p200300EA8BF1E2004C36C93069B6C10F.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:4c36:c930:69b6:c10f]) by smtp.googlemail.com with ESMTPSA id i13sm17198522wrm.86.2019.02.17.00.41.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 00:41:47 -0800 (PST) Subject: [PATCH net-next v2 4/4] net: phy: marvell10g: check for newly set aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: Message-ID: <8fa90a90-a541-2a70-c783-8ba12f965493@gmail.com> Date: Sun, 17 Feb 2019 09:40:05 +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: 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 Reviewed-by: Florian Fainelli --- 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 895574083..b83eb19cf 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -296,6 +296,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