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 5982FC43381 for ; Sun, 17 Feb 2019 09:32:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28ADA2192D for ; Sun, 17 Feb 2019 09:32:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FqoPP4FE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727597AbfBQJcv (ORCPT ); Sun, 17 Feb 2019 04:32:51 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38219 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727451AbfBQJct (ORCPT ); Sun, 17 Feb 2019 04:32:49 -0500 Received: by mail-wm1-f66.google.com with SMTP id v26so13951762wmh.3 for ; Sun, 17 Feb 2019 01:32:48 -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=FqoPP4FEHRaAYqtEoFpfCsFxDkhm8QiHW8n88IZ7Bk0+97f15pezwzUMJmMI4iv0Pc zkoX/x+CaUsEpqJhXpcLooT3E9vFo0ggFFsBthqED50GZSDF0CUzwowCHmohl4W6RPGE QVAiWg/jwWv4VLzcbiJoQ5KJgwQRUIOt75yYmJatED9Lwr7c/gwbwGKrc9OnFN+O0D7R KyRbN3QEkkr4OCGUv5UaKt29hnl4rcKy9w2kcjFE5zJtmk9xBFYqydq116JLx2MLLo3V /UWO6pyqygxdGbZukX1VUiWRj7rv+pt+jc0WB7yL9we81cP1VUzUWE7HykLRFY8shA7D YRIA== 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=OWZJZZmoX3B2geIJAirGbYuT7hqV6XoGtYor+uJh+AMAjhC9Haa3svBHrjonxc3HGj 2GsLmASSt3IjJ/vKLOnQqUtoovHiw5F5Bi+jPcIhuiarrUITM+RaWmjhSu7pV2qOgHcH l20lBDGtJqOZg/P/nCytwcE1qFP3kCyBtYTy3wtdl37xYrHPqp6XdLmkwKnXrl7XCeqZ /WqQ9DqVtUNDNJz/8g1j3HegQN4knIukui6wG6RrwVWaZrxWnYi+8hvOPImC/ag4Pz8j mPQ7knUF920twMGKvtzj+xqaxxq/8pW52phmpOjE0E5u2oWdqrSTQudIa6xtYJ4miDzA oYDQ== X-Gm-Message-State: AHQUAuY8i4Yx/n7NmLRcJccyfSpZDVCYHe2YTCmXshMK1pAiuogPzqfk d3OQRSrrblXzjFNnAjyi59HiyL6d X-Google-Smtp-Source: AHgI3IZZWVmVd1h4327ubEJvgUbRu1nO6gcp5krnJfhVXLpNtchBUbTs+NaOXkIToMs2UxfdToHLHQ== X-Received: by 2002:a7b:c419:: with SMTP id k25mr2360950wmi.34.1550395967225; Sun, 17 Feb 2019 01:32:47 -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 n6sm8115648wmk.9.2019.02.17.01.32.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 01:32:46 -0800 (PST) Subject: [PATCH net-next v3 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: <46898fe1-8924-0da0-1bbd-b54c220ff8d1@gmail.com> Message-ID: <1cbf0f56-b0c1-6d60-69b5-774053979469@gmail.com> Date: Sun, 17 Feb 2019 10:32: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: <46898fe1-8924-0da0-1bbd-b54c220ff8d1@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 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