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 5315FC43381 for ; Sun, 17 Feb 2019 02:47:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17BD321917 for ; Sun, 17 Feb 2019 02:47:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JageWLsl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727751AbfBQCra (ORCPT ); Sat, 16 Feb 2019 21:47:30 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33363 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725799AbfBQCra (ORCPT ); Sat, 16 Feb 2019 21:47:30 -0500 Received: by mail-pf1-f193.google.com with SMTP id c123so6804914pfb.0 for ; Sat, 16 Feb 2019 18:47:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zW8PHmM8VwDTfiuKPmr8bFVTHPavnS7c5CMPgK3aIA8=; b=JageWLsl1RRHQfNAo1YwvlxP6qKM22fWYLd4OQmFE8MFIVyE/hJxLcFwsWNodbXFF6 joSba8AfjnSXkpcJpS8GIW48HKPYMIZ0HVq352dZWW5JHgJbQYJJgfdL1vqWKyTsp+Aw Y7YGxXBmHZ2EvlHvvcA1XTRyIWE8sekaGOMh7Dm+7x0iR5WUZTaooZ1BcV5uAqfct2CM TJcLpAHtpWX4NUbnlJqYpzRu0s/hpZktXMdawm3jlPcC/NZuddl6S1QYGnfOb3hlDuTr JPOL9zT8F8A88mR5JawJ+6YJNqo9xjd6N/SLssvMpfavKJNL6EKe9vOQjvOgG13/nzl+ rHYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=zW8PHmM8VwDTfiuKPmr8bFVTHPavnS7c5CMPgK3aIA8=; b=fS6LBiae7GcmFNYIDWfekAjtmc/InbApnolIwac8tsID5AkS9fjbeGjruL8cfsuEic GeOV3kUaTzKsM0SSiSMYhLsyFPQnKpeT8cBGYraNMkYfMaOcbg1SHgmXS7fgAwjxrilY AYbe5McvPBPVbAJNqWvsnlwx9AyaYh3CW39q3x0a25B3UQiCykAC8gLyTe1S5g0PgAA1 Pvi5XJdLXF+FEG7+HceKT0/z/miLh3xfFvT4m67L3Fcf9nSO6htYojgK17czObihCYS0 3G5L0fCH0i9A1uFWG/mnudGLDQmI+C55Y6Ui+IUS5y/KwSM943LDAYOf5RocesQtmhPl Xs1Q== X-Gm-Message-State: AHQUAuaEpRYR2m8NBF0p6R15MvsH008SsYXbcccz/w4cH6luyY8Geyur y6zBbdIyG1IVG0XGREDCR/QgFPmq X-Google-Smtp-Source: AHgI3IY7LBy0L+QRz7XZUTt9bHnrJfjTPa8h/hwKNTGRVPW1xe0Rcu6qJNvPSOdUQW+rJiPDZRE7Ag== X-Received: by 2002:a63:5813:: with SMTP id m19mr12519458pgb.294.1550371649106; Sat, 16 Feb 2019 18:47:29 -0800 (PST) Received: from [192.168.1.3] (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id y14sm11305302pgc.17.2019.02.16.18.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 18:47:28 -0800 (PST) Subject: Re: [PATCH net-next 3/4] net: phy: marvell10g: use genphy_c45_an_config_an To: Heiner Kallweit , Andrew Lunn , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com> <2ad2dd35-45f5-9720-d2ae-0ee104a7d782@gmail.com> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; keydata= 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 w0j9Sw== Message-ID: <2d9ed6ca-60a0-b0da-8e86-f2fd3ef64343@gmail.com> Date: Sat, 16 Feb 2019 18:47:18 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <2ad2dd35-45f5-9720-d2ae-0ee104a7d782@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 On 2/16/2019 11:52 AM, Heiner Kallweit wrote: > From: Andrew Lunn > Use new function genphy_c45_config_aneg() in mv3310_config_aneg(). > > Signed-off-by: Andrew Lunn > [hkallweit1@gmail.com: patch splitted] > Signed-off-by: Heiner Kallweit > --- > drivers/net/phy/marvell10g.c | 22 +--------------------- > 1 file changed, 1 insertion(+), 21 deletions(-) > > diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c > index 4a6ae63ab..03fa50087 100644 > --- a/drivers/net/phy/marvell10g.c > +++ b/drivers/net/phy/marvell10g.c > @@ -274,13 +274,7 @@ 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_an(phydev); > if (ret < 0) > return ret; > if (ret > 0) > @@ -294,20 +288,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; This is not strictly equivalent though because marvell10g only checks for the 10000baseT_Full bit set whereas genphy_c45_an_config_an() calls linkmode_adv_to_mii_10gbt_adv_t() which you recently updated to also check for 2.5G and 5G. This sounds about the right decision, but I wonder if Russell did this for a reason (like not able to test 2500baseT and 5000baseT?) > - > - 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); > > -- Florian