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 757A0C43381 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 45544218FF 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="nozS3RPX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726844AbfBQIlu (ORCPT ); Sun, 17 Feb 2019 03:41:50 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40477 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725768AbfBQIls (ORCPT ); Sun, 17 Feb 2019 03:41:48 -0500 Received: by mail-wm1-f66.google.com with SMTP id t15so5794641wmi.5 for ; Sun, 17 Feb 2019 00:41:47 -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=5O697bxddej7dH+UQ1E8ZSDYZmr5PL73RKp1ZSafV5c=; b=nozS3RPX5u1ZRipNX+2zYCTvwONvzRlnM9YcvtdrAWwU5p4Bf6ji1Uv3VJkipowet9 1mqnqo5sUDavP0wemFrn81hewOciYB3n7lFoVChL0tvErEgxniRDXIFxL0SFVsiCovLy FIZPXddLWswi526n5C67XBP0sbgIq54lasyMuDJNJatFG929B29lE2AriO8ZAc4CPJkY hgoniBN/Y8e44iXLn5SIoTwEVZt6u1hgP0svxFjsNmK1waPX0h099hcdnI6hKV809FoC xovUGsYCwyMVOg63bHJTLmJ5LgOgNvOViVJj6OdHbzCvt/sGMNCs5syK0UhhkkqejJCq rYmA== 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=5O697bxddej7dH+UQ1E8ZSDYZmr5PL73RKp1ZSafV5c=; b=DYecIvZTQTKYOiZE909dedR+PuhFXHNdayls2HEarUpeSXM26w7ipu7DmUZ0u2scCd ze4mDDmRFhZ16aDV/E4vsEB0ptJ2UHJy3HR5rLUP9vK+5pypyHUlOZRtm0lmMNpuP55n +o4t6Ij8W33+jlB7EGgx/gjTeL31wsu0e0bhL8jF/GW7YMKSais60EW5IXb1AifCEyGj s56YenGR9wU/yJuDAxJz3bWol7jLMcVfUUvJi/3Kb1/0T4FIDeA4+G3gKSjYlHE3Fhes sBT5gAN4meN56DCdqilFrTxNcWFAjNioeOo+fUK//IReb4UA+cdFWJu5r+SYnYda139a 4bCw== X-Gm-Message-State: AHQUAub+LA4YWzBs70lkheqZuMijmz29xq1EA6o30uDR7j/Z1rcTVlCb HSr+2CagybPF74+ADVsD7OZUwcwP X-Google-Smtp-Source: AHgI3IaWZ3YTKeRWs54WFK90bkHsfXY9m256/zgf8qaTD4rdAdJtKvbVi4lQ5RPW4OP3BYoBUQRXmg== X-Received: by 2002:a1c:1d15:: with SMTP id d21mr11234466wmd.132.1550392906661; Sun, 17 Feb 2019 00:41:46 -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 b18sm6373500wro.80.2019.02.17.00.41.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 00:41:46 -0800 (PST) Subject: [PATCH net-next v2 3/4] net: phy: marvell10g: use genphy_c45_an_config_aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 17 Feb 2019 09:39:20 +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 From: Andrew Lunn Use new function genphy_c45_config_aneg() in mv3310_config_aneg(). v2: - add a comment regarding 1000BaseT vendor registers Signed-off-by: Andrew Lunn [hkallweit1@gmail.com: patch splitted] Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 496805c0d..895574083 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -279,18 +279,15 @@ static int mv3310_config_aneg(struct phy_device *phydev) return genphy_c45_an_disable_aneg(phydev); } - linkmode_and(phydev->advertising, phydev->advertising, - phydev->supported); - - ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, - ADVERTISE_ALL | ADVERTISE_100BASE4 | - ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, - linkmode_adv_to_mii_adv_t(phydev->advertising)); + ret = genphy_c45_an_config_aneg(phydev); if (ret < 0) return ret; if (ret > 0) changed = true; + /* Clause 45 has no standardized support for 1000BaseT, therefore + * use vendor registers for this mode. + */ reg = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising); ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MV_AN_CTRL1000, ADVERTISE_1000FULL | ADVERTISE_1000HALF, reg); @@ -299,20 +296,6 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (ret > 0) changed = true; - /* 10G control register */ - if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, - phydev->advertising)) - reg = MDIO_AN_10GBT_CTRL_ADV10G; - else - reg = 0; - - ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, - MDIO_AN_10GBT_CTRL_ADV10G, reg); - if (ret < 0) - return ret; - if (ret > 0) - changed = true; - if (changed) ret = genphy_c45_restart_aneg(phydev); -- 2.20.1