netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: netdev <netdev@vger.kernel.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>
Subject: [PATH RFC net-next 5/8] net: phy: Add limkmode equivalents to some of the MII ethtool helpers
Date: Fri, 14 Sep 2018 23:38:53 +0200	[thread overview]
Message-ID: <1536961136-30453-6-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1536961136-30453-1-git-send-email-andrew@lunn.ch>

Add helpers which take a linkmode rather than a u32 ethtool for
advertising settings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 include/linux/mii.h | 50 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/include/linux/mii.h b/include/linux/mii.h
index 9ed49c8261d0..2da85b02e1c0 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -132,6 +132,34 @@ static inline u32 ethtool_adv_to_mii_adv_t(u32 ethadv)
 	return result;
 }
 
+/**
+ * linkmode_adv_to_mii_adv_t
+ * @advertising: the linkmode advertisement settings
+ *
+ * A small helper function that translates linkmode advertisement
+ * settings to phy autonegotiation advertisements for the
+ * MII_ADVERTISE register.
+ */
+static inline u32 linkmode_adv_to_mii_adv_t(unsigned long *advertising)
+{
+	u32 result = 0;
+
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, advertising))
+		result |= ADVERTISE_10HALF;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, advertising))
+		result |= ADVERTISE_10FULL;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, advertising))
+		result |= ADVERTISE_100HALF;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, advertising))
+		result |= ADVERTISE_100FULL;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, advertising))
+		result |= ADVERTISE_PAUSE_CAP;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, advertising))
+		result |= ADVERTISE_PAUSE_ASYM;
+
+	return result;
+}
+
 /**
  * mii_adv_to_ethtool_adv_t
  * @adv: value of the MII_ADVERTISE register
@@ -179,6 +207,28 @@ static inline u32 ethtool_adv_to_mii_ctrl1000_t(u32 ethadv)
 	return result;
 }
 
+/**
+ * linkmode_adv_to_mii_ctrl1000_t
+ * advertising: the linkmode advertisement settings
+ *
+ * A small helper function that translates linkmode advertisement
+ * settings to phy autonegotiation advertisements for the
+ * MII_CTRL1000 register when in 1000T mode.
+ */
+static inline u32 linkmode_adv_to_mii_ctrl1000_t(unsigned long *advertising)
+{
+	u32 result = 0;
+
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
+			      advertising))
+		result |= ADVERTISE_1000HALF;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+			      advertising))
+		result |= ADVERTISE_1000FULL;
+
+	return result;
+}
+
 /**
  * mii_ctrl1000_to_ethtool_adv_t
  * @adv: value of the MII_CTRL1000 register
-- 
2.19.0.rc1

  parent reply	other threads:[~2018-09-15  2:55 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-14 21:38 [PATH RFC net-next 0/8] Continue towards using linkmode in phylib Andrew Lunn
2018-09-14 21:38 ` [PATH RFC net-next 1/8] net: phy: Move linkmode helpers to somewhere public Andrew Lunn
2018-09-14 22:08   ` Florian Fainelli
2018-09-16 19:18     ` Andrew Lunn
2018-09-17  9:48   ` Maxime Chevallier
2018-09-14 21:38 ` [PATH RFC net-next 2/8] net: phy: Add phydev_warn() Andrew Lunn
2018-09-14 22:10   ` Florian Fainelli
2018-09-14 23:26     ` Andrew Lunn
2018-09-17  9:49   ` Maxime Chevallier
2018-09-14 21:38 ` [PATH RFC net-next 3/8] net: phy: Add helper to convert MII ADV register to a linkmode Andrew Lunn
2018-09-14 22:23   ` Florian Fainelli
2018-09-14 23:23     ` Andrew Lunn
2018-09-17  9:50   ` Maxime Chevallier
2018-09-14 21:38 ` [PATH RFC net-next 4/8] net: phy: Add helper for advertise to lcl value Andrew Lunn
2018-09-15  0:27   ` Florian Fainelli
2018-09-17  9:51   ` Maxime Chevallier
2018-09-14 21:38 ` Andrew Lunn [this message]
2018-09-15  0:28   ` [PATH RFC net-next 5/8] net: phy: Add limkmode equivalents to some of the MII ethtool helpers Florian Fainelli
2018-09-17  9:53   ` Maxime Chevallier
2018-09-14 21:38 ` [PATH RFC net-next 6/8] net: ethernet xgbe expand PHY_GBIT_FEAUTRES Andrew Lunn
2018-09-15 10:01   ` Sergei Shtylyov
2018-09-14 21:38 ` [PATH RFC net-next 7/8] net: phy: Replace phy driver features u32 with link_mode bitmap Andrew Lunn
2018-09-15 21:31   ` Florian Fainelli
2018-09-15 22:30     ` Andrew Lunn
2018-09-16 16:20       ` Florian Fainelli
2018-09-16 17:59         ` Andrew Lunn
2018-09-14 21:38 ` [PATH RFC net-next 8/8] net: phy: Add build warning if assumptions get broken Andrew Lunn
2018-09-15 21:31   ` Florian Fainelli
2018-09-17 10:01 ` [PATH RFC net-next 0/8] Continue towards using linkmode in phylib Maxime Chevallier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1536961136-30453-6-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=f.fainelli@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).