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,URIBL_BLOCKED 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 25F43C43381 for ; Sun, 17 Feb 2019 09:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECC6C2192D for ; Sun, 17 Feb 2019 09:32:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TUIIIVKG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727519AbfBQJcs (ORCPT ); Sun, 17 Feb 2019 04:32:48 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38168 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbfBQJcr (ORCPT ); Sun, 17 Feb 2019 04:32:47 -0500 Received: by mail-wr1-f65.google.com with SMTP id v13so14957120wrw.5 for ; Sun, 17 Feb 2019 01:32: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=wRz1dh74PqyhVJ1Jr7Mn5r05E1sJGfmpMtXWI4G3p0s=; b=TUIIIVKGVe1k6OwhvC58PvFkal4ukA5EH/tpJzHlIVD3PsAxmqW5x+ZyQVoKHsQpS+ ZptEkGvd6DiZQSFmq6nxvvq2R1fB2XDyQZABXAAhSnXOknJsDzEkgNIbIPnTqcl1yNJ6 DYFoj6Vs2UrmZ1+ZHnGg+YVR+dHEFSITSKvWxeTe4R5HuufeYEtyrXVNFnzJOeYwJCnG uswTkAF3fbyTz0OQkfgYIdBGrScGiJaIrvxo7SGWzBQ7HoWXz79m8br9j1Jtn0xxL7JX 0vdsdOa/DWRicMRogyCsM8VDXaBv/8MA0HADP5CIyfEjbUFmDCmk+UQTZdFfvkWRtJed aBPg== 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=wRz1dh74PqyhVJ1Jr7Mn5r05E1sJGfmpMtXWI4G3p0s=; b=Z+CdzRy7nX7UVl3qOL1jHpafCmynpMRVeE/GikRTbTTo0ZKfU79NkDSMRHjiw+jUC4 BfOqNhp+3dadclxNhF0+QH7Dx0RKXB0G9lCCcA5CqMKLU30oqFXmahiMJ2qx0e5seU9P +Z2HJC2B+sl6e9MFtXXxEyUX46bXi1kOjvLmhu4L1R8XneIx8B8uI4OsKH6Yh95lQha6 d8jOGJPScQxlP/FJISdY/X/aTVeMguFXNGcjaWvjwdkM2ez4vXN744Mp6o3RiM2VPTkp mWUKrwh8OhPI3vuFBhtR7O8ktTCm8zFNPiYrZAZsb0BND44MRE+H+TcGvHl+SEaLU4zF gcKw== X-Gm-Message-State: AHQUAuZ1AX2WgOiE0yDFbRvZtA4hycFa+kCZDnfFn157+xjpGyVJhHNp A3OuJAbL30tILYEbV5dAo0MhNyNB X-Google-Smtp-Source: AHgI3IbYCk+I0cRor7lr4AO067+vxEX6NIaIrMfvBhfiHDyAej+9DnxL4gQBTE2b7MohZwXFkSUADQ== X-Received: by 2002:adf:dc84:: with SMTP id r4mr13002704wrj.115.1550395965642; Sun, 17 Feb 2019 01:32:45 -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 2sm23562377wrg.89.2019.02.17.01.32.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 01:32:45 -0800 (PST) Subject: [PATCH net-next v3 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: <46898fe1-8924-0da0-1bbd-b54c220ff8d1@gmail.com> Message-ID: <1ae35aff-c882-c9a0-8d90-4b9ffb908963@gmail.com> Date: Sun, 17 Feb 2019 10:30:45 +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 From: Andrew Lunn Use new function genphy_c45_config_aneg() in mv3310_config_aneg(). v2: - add a comment regarding 1000BaseT vendor registers v3: - rebased 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 4a6ae63ab..b7742799c 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -274,18 +274,15 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (phydev->autoneg == AUTONEG_DISABLE) return genphy_c45_pma_setup_forced(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); @@ -294,20 +291,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