From patchwork Sat Feb 16 16:26:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1043447 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r6oy9fXV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441wWS44lfz9s3l for ; Sun, 17 Feb 2019 03:27:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730984AbfBPQ05 (ORCPT ); Sat, 16 Feb 2019 11:26:57 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53683 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730952AbfBPQ05 (ORCPT ); Sat, 16 Feb 2019 11:26:57 -0500 Received: by mail-wm1-f65.google.com with SMTP id d15so12992794wmb.3 for ; Sat, 16 Feb 2019 08:26:56 -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=yXqRJCt/zeCETxdvkSWerydfW33f0jNikY1+v0KBdws=; b=r6oy9fXVXOebE05nElCkT6IIuPlSpPtkIEE2teY9qt2Mx9JO/Ad7QgqHZw732S/GVE p5jOUGyvjYxwy12ROintPNAQRHTPOqBgu1dxL0eTk2FxOn23N56itlOQu9WC5ceI/XqJ DDetNDVjFOgQEsxpFqKhD9vQhq0lqrcdwvJtYEuJdp4fJK33f9i8LDZjC2bmam4AuCIU BMhPNAXmMI/h66PEg56h9eBmVg4I7CwTicAPRguQqtkNd43dZy7W5/VKMi59pWYAs9qS ezj5kcPcXVZ6dqQtNGPmAkZXGFK8Qe0Dhwct1/viAzLv6pHNoZE7y1GX29NwMQ0rkr4b TnSQ== 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=yXqRJCt/zeCETxdvkSWerydfW33f0jNikY1+v0KBdws=; b=DoMVc6h+YiwUsPDb3UlX2q7oca/WjQRE28mFLYqwzYAzZnr1E+N/2oKaNnJsoOQv+s ZyfzbeiyakuihlcmXl67ZJW8b1WvPoJFR2+fEnt97IEjAbbW7XGYbRwp8+ykki0j8Nf3 jtOWBdJO3/sEasuz0mkVzxi7GRf1PYgwCqxuk1pYkmSSYj8Df8a2Es9RtfVVK6Do/DhN o1g52cQXqQdAkmEuSN8I8u+jBc7mpNe8fzknMEesndcPzTk1SCcJuBH09d49NT+LNBNb TdYvv/UFAtJhTAOqWVvO2FnKp8X2vUbMtlmYUgkd3ywTYJDaxOGnubjv6Ye38rt4bF2L REUA== X-Gm-Message-State: AHQUAubom/0IVeQuXY4XFnn6pGMY3iC2ZVsuJKJA07In8YvZUh+WMlRg w/dp6w8DVkQI8pnBWmwS1p9qfwrs X-Google-Smtp-Source: AHgI3IYg8yBvCJde9RiIK8axKUoMV+2KV7UJ+hJbRETOL5dQ+6zr9lxqp+xkOF1Wqet/NHFYAAyb0Q== X-Received: by 2002:a1c:be11:: with SMTP id o17mr10355751wmf.141.1550334415524; Sat, 16 Feb 2019 08:26:55 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:fc50:d076:bfa9:dffa? (p200300EA8BF1E200FC50D076BFA9DFFA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:fc50:d076:bfa9:dffa]) by smtp.googlemail.com with ESMTPSA id f13sm14396570wmh.41.2019.02.16.08.26.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 08:26:54 -0800 (PST) Subject: [PATCH net-next v2 1/2] net: phy: add helper mii_10gbt_stat_mod_linkmode_lpa_t From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sat, 16 Feb 2019 17:26:05 +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-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Similar to the existing helpers for the Clause 22 registers add helper mii_10gbt_stat_mod_linkmode_lpa_t. Note that this helper is defined in linux/mdio.h, not like the Clause 22 helpers in linux/mii.h. Reason is that the Clause 45 register constants are defined in uapi/linux/mdio.h. And uapi/linux/mdio.h includes linux/mii.h before defining the C45 register constants. v2: - remove helpers that don't have users in this series Signed-off-by: Heiner Kallweit Reviewed-by: Florian Fainelli --- include/linux/mdio.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/linux/mdio.h b/include/linux/mdio.h index bfa711416..5b872c45f 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -261,6 +261,25 @@ static inline u16 ethtool_adv_to_mmd_eee_adv_t(u32 adv) return reg; } +/** + * mii_10gbt_stat_mod_linkmode_lpa_t + * @advertising: target the linkmode advertisement settings + * @adv: value of the C45 10GBASE-T AN STATUS register + * + * A small helper function that translates C45 10GBASE-T AN STATUS register bits + * to linkmode advertisement settings. Other bits in advertising aren't changed. + */ +static inline void mii_10gbt_stat_mod_linkmode_lpa_t(unsigned long *advertising, + u32 lpa) +{ + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + advertising, lpa & MDIO_AN_10GBT_STAT_LP2_5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + advertising, lpa & MDIO_AN_10GBT_STAT_LP5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, + advertising, lpa & MDIO_AN_10GBT_STAT_LP10G); +} + int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum); int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val); From patchwork Sat Feb 16 16:26:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1043448 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sdNOQz2V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441wWW0ldBz9s3l for ; Sun, 17 Feb 2019 03:27:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731028AbfBPQ1B (ORCPT ); Sat, 16 Feb 2019 11:27:01 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39500 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730990AbfBPQ07 (ORCPT ); Sat, 16 Feb 2019 11:26:59 -0500 Received: by mail-wr1-f68.google.com with SMTP id l5so12372288wrw.6 for ; Sat, 16 Feb 2019 08:26:57 -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=tqpwAxcGtF9B2IRIglLgWhJbSqcD3hUc59TrMMQ3Kk4=; b=sdNOQz2VSs5LFbeNIMzF9FiKcxVoKQMUpf8WN0+4ca4ESsrdk84kFOXXAhfXYruLc8 +WdaQiIj0SZiYx7VE+YSI398fcX3WGeLoJhfiRoL1Zyj+SD7CK4Hgt9s2lIxAU3jrW32 YFJA1/+bbOq6gKz0zpZVjiqTn6NCbGNnpXR5C3QhGvKs+nTu/k9k+Fg80yi7XvyuGSCA cE7nnkiNdfv54+ZBZsIlEnC2q1MUvTf5P9a7sJ1IRnr+sfHv667oC9wrHT8y70A/fAlV pZv7fWgEloNxwmJAv2MceRSsKJmdqf+GmqASQ7RHZvW9dd2k60CZuSr/mcW3fiHnm+gf xkqw== 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=tqpwAxcGtF9B2IRIglLgWhJbSqcD3hUc59TrMMQ3Kk4=; b=fPqzgcA3E7pc11xcz2+lPCJjyK2D5coxJWjysCnXCpJ+82WmLdnV1tKd/WospIpaow U8xKJNESgj/5J1Ycpd7Ezz1QSvXROK3H+M5JG6dD7DNK8gGTEMTksuiNZQaP9wYeTe+a hQ4XmFGUd5X6H4c4GLmDJ9MtacgmOvuNg/W6bapmDVAwn2Hsw9/+jPR7zLNxxoEon/Dy gXkxrTEQn+R2skAnGFo13Lbd0dvyWt72mz7ZnKdONb1il+N+pfz2hIOro0s14WDf7NIv BawGH4D+Vt4tkZio3ZK8d9pLeSsgI5myquTO48G/ox8ZXaGHDDRDkpsE+nUmINg7Pdyb MMNQ== X-Gm-Message-State: AHQUAuZn/EIVbs68v7CqEBpcTPFgNVS7hYU7Tr0I7vTpZr82YhpFUhHZ paPCXNYAzZ/xls7vfTafcs2YWzLJ X-Google-Smtp-Source: AHgI3IaZGR1pIPF6t3Q+oBGM+QYb8nRN4C+UMYHkzN9Okfs2yU9ZsxkmqKC+T2ngjF9v2Vos+LsBgw== X-Received: by 2002:a5d:528d:: with SMTP id c13mr11130521wrv.153.1550334417016; Sat, 16 Feb 2019 08:26:57 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:fc50:d076:bfa9:dffa? (p200300EA8BF1E200FC50D076BFA9DFFA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:fc50:d076:bfa9:dffa]) by smtp.googlemail.com with ESMTPSA id c186sm13496424wmf.34.2019.02.16.08.26.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 08:26:56 -0800 (PST) Subject: [PATCH net-next v2 2/2] net: phy: use mii_10gbt_stat_mod_linkmode_lpa_t in genphy_c45_read_lpa From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <05e7f5fd-5783-f576-b164-2a64239ff6d7@gmail.com> Date: Sat, 16 Feb 2019 17:26:50 +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-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use mii_10gbt_stat_mod_linkmode_lpa_t() in genphy_c45_read_lpa() to simplify the code. Signed-off-by: Heiner Kallweit Reviewed-by: Florian Fainelli --- drivers/net/phy/phy-c45.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 7af5fa81d..bef126344 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -204,15 +204,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev) if (val < 0) return val; - if (val & MDIO_AN_10GBT_STAT_LP2_5G) - linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - phydev->lp_advertising); - if (val & MDIO_AN_10GBT_STAT_LP5G) - linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, - phydev->lp_advertising); - if (val & MDIO_AN_10GBT_STAT_LP10G) - linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, - phydev->lp_advertising); + mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, val); return 0; }