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=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT 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 D43C3C43381 for ; Fri, 15 Feb 2019 13:57:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A09F1218AC for ; Fri, 15 Feb 2019 13:57:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=lunn.ch header.i=@lunn.ch header.b="BqSre7gH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388501AbfBON5S (ORCPT ); Fri, 15 Feb 2019 08:57:18 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:53709 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387546AbfBON5S (ORCPT ); Fri, 15 Feb 2019 08:57:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=gnMiw708WXFBqR/G6ra2GHrHHU6TSKewVWYCxgDn3fg=; b=BqSre7gHsVD1KtcLSlMP1cUKx7 ec/LPsI1ET9IGXO8QkxZt7Sq/d26gs0Iby2EZjmag750qDrp7D6+5wzyL3SfYU/NtuFN9lzwrKT4i xkXr2PIgfcdgyPNDj5Ft0E4/kM/UwcTVVT4fNDmQ/TynBGlqlekNCAB4LWcQqbOd+TNc=; Received: from andrew by vps0.lunn.ch with local (Exim 4.89) (envelope-from ) id 1gudzO-0005fS-O5; Fri, 15 Feb 2019 14:57:14 +0100 Date: Fri, 15 Feb 2019 14:57:14 +0100 From: Andrew Lunn To: Heiner Kallweit Cc: Florian Fainelli , David Miller , "netdev@vger.kernel.org" Subject: Re: [PATCH net-next 1/2] net: phy: improve phy_resolve_aneg_linkmode Message-ID: <20190215135714.GI5699@lunn.ch> References: <1571d9d1-b3ad-8c96-a476-4ae18d20abfe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1571d9d1-b3ad-8c96-a476-4ae18d20abfe@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Feb 14, 2019 at 10:15:31PM +0100, Heiner Kallweit wrote: > We have the settings array of modes which is sorted based on aneg > priority. Instead of checking each mode manually let's simply iterate > over the sorted settings. > > Signed-off-by: Heiner Kallweit > --- > drivers/net/phy/phy-core.c | 43 +++++++------------------------------- > 1 file changed, 7 insertions(+), 36 deletions(-) > > diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c > index cdea028d1..5d43106fe 100644 > --- a/drivers/net/phy/phy-core.c > +++ b/drivers/net/phy/phy-core.c > @@ -349,45 +349,16 @@ size_t phy_speeds(unsigned int *speeds, size_t size, > void phy_resolve_aneg_linkmode(struct phy_device *phydev) > { > __ETHTOOL_DECLARE_LINK_MODE_MASK(common); > + int i; > > linkmode_and(common, phydev->lp_advertising, phydev->advertising); > > - if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, common)) { > - phydev->speed = SPEED_10000; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, > - common)) { > - phydev->speed = SPEED_5000; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, > - common)) { > - phydev->speed = SPEED_2500; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, > - common)) { > - phydev->speed = SPEED_1000; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, > - common)) { > - phydev->speed = SPEED_1000; > - phydev->duplex = DUPLEX_HALF; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, > - common)) { > - phydev->speed = SPEED_100; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, > - common)) { > - phydev->speed = SPEED_100; > - phydev->duplex = DUPLEX_HALF; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, > - common)) { > - phydev->speed = SPEED_10; > - phydev->duplex = DUPLEX_FULL; > - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, > - common)) { > - phydev->speed = SPEED_10; > - phydev->duplex = DUPLEX_HALF; > - } > + for (i = 0; i < ARRAY_SIZE(settings); i++) > + if (test_bit(settings[i].bit, common)) { > + phydev->speed = settings[i].speed; > + phydev->duplex = settings[i].duplex; > + break; > + } Hi Heiner Nice simplification. I just have one thought about this. The original code was limited to baseT. The new code could in theory return a non BaseT speed. For that to happen, it would require that phydev->lp_advertising and phydev->advertising contain a non BaseT link mode? Is that possible? I don't think it is. Andrew