All of lore.kernel.org
 help / color / mirror / Atom feed
From: <alexandru.tachici@analog.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<devicetree@vger.kernel.org>
Cc: <robh+dt@kernel.org>, <andrew@lunn.ch>, <hkallweit1@gmail.com>,
	<linux@armlinux.org.uk>, <davem@davemloft.net>, <kuba@kernel.org>,
	"Alexandru Tachici" <alexandru.tachici@analog.com>
Subject: [PATCH v2 2/7] ethtool: Add 10base-T1L voltage levels link mode entries
Date: Mon, 12 Jul 2021 16:06:26 +0300	[thread overview]
Message-ID: <20210712130631.38153-3-alexandru.tachici@analog.com> (raw)
In-Reply-To: <20210712130631.38153-1-alexandru.tachici@analog.com>

From: Alexandru Tachici <alexandru.tachici@analog.com>

Add entries for the 10base-T1L possible link voltage levels.

Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com>
---
 drivers/net/phy/phy-core.c   | 2 +-
 include/uapi/linux/ethtool.h | 2 ++
 net/ethtool/common.c         | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index fd9c83ce10fc..a82e7457bda2 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -13,7 +13,7 @@
  */
 const char *phy_speed_to_str(int speed)
 {
-	BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 94,
+	BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 96,
 		"Enum ethtool_link_mode_bit_indices and phylib are out of sync. "
 		"If a speed or mode has been added please update phy_speed_to_str "
 		"and the PHY settings array.\n");
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 8a905466d7dc..748d7a01e4e9 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1661,6 +1661,8 @@ enum ethtool_link_mode_bit_indices {
 	ETHTOOL_LINK_MODE_100baseFX_Full_BIT		 = 91,
 	ETHTOOL_LINK_MODE_10baseT1L_Half_BIT		 = 92,
 	ETHTOOL_LINK_MODE_10baseT1L_Full_BIT		 = 93,
+	ETHTOOL_LINK_MODE_2400mv_BIT			 = 94,
+	ETHTOOL_LINK_MODE_1000mv_BIT			 = 95,
 	/* must be last entry */
 	__ETHTOOL_LINK_MODE_MASK_NBITS
 };
diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index 5b93d888fd83..c0110a4b3392 100644
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -201,6 +201,8 @@ const char link_mode_names[][ETH_GSTRING_LEN] = {
 	__DEFINE_LINK_MODE_NAME(100, FX, Full),
 	__DEFINE_LINK_MODE_NAME(10, T1L, Half),
 	__DEFINE_LINK_MODE_NAME(10, T1L, Full),
+	__DEFINE_SPECIAL_MODE_NAME(2400mv, "2400mv"),
+	__DEFINE_SPECIAL_MODE_NAME(1000mv, "1000mv"),
 };
 static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 
@@ -349,6 +351,8 @@ const struct link_mode_info link_mode_params[] = {
 	__DEFINE_LINK_MODE_PARAMS(400000, CR4, Full),
 	__DEFINE_LINK_MODE_PARAMS(100, FX, Half),
 	__DEFINE_LINK_MODE_PARAMS(100, FX, Full),
+	__DEFINE_SPECIAL_MODE_PARAMS(2400mv),
+	__DEFINE_SPECIAL_MODE_PARAMS(1000mv),
 };
 static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 
-- 
2.25.1


  parent reply	other threads:[~2021-07-12 12:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12 13:06 [PATCH v2 0/7] net: phy: adin1100: Add initial support for ADIN1100 industrial PHY alexandru.tachici
2021-07-12 13:06 ` [PATCH v2 1/7] ethtool: Add 10base-T1L link mode entries alexandru.tachici
2021-07-13 16:50   ` Andrew Lunn
2021-07-27  5:56   ` Oleksij Rempel
2021-07-12 13:06 ` alexandru.tachici [this message]
2021-07-12 13:06 ` [PATCH v2 3/7] net: phy: adin1100: Add initial support for ADIN1100 industrial PHY alexandru.tachici
2021-07-13 16:58   ` Andrew Lunn
2021-07-16 21:24     ` ADIN1100 alexandru.tachici
2021-07-23 17:20       ` ADIN1100 Oleksij Rempel
2021-07-27  6:31     ` [PATCH v2 3/7] net: phy: adin1100: Add initial support for ADIN1100 industrial PHY Oleksij Rempel
2021-07-27  6:47   ` Oleksij Rempel
2021-07-27 16:36     ` Andrew Lunn
2021-07-12 13:06 ` [PATCH v2 4/7] net: phy: adin1100: Add ethtool get_stats support alexandru.tachici
2021-07-12 18:41   ` Jakub Kicinski
2021-07-12 13:06 ` [PATCH v2 5/7] net: phy: adin1100: Add ethtool master-slave support alexandru.tachici
2021-07-13 17:53   ` Andrew Lunn
2021-07-12 13:06 ` [PATCH v2 6/7] net: phy: adin1100: Add SQI support alexandru.tachici
2021-07-13 17:55   ` Andrew Lunn
2021-07-12 13:06 ` [PATCH v2 7/7] dt-bindings: adin1100: Add binding for ADIN1100 Ethernet PHY alexandru.tachici
2021-07-12 14:12   ` Rob Herring
2021-07-12 17:46     ` Rob Herring
2021-07-27  5:53   ` Oleksij Rempel
2021-07-28 17:23     ` Rob Herring
2021-07-29  5:02       ` Oleksij Rempel
2021-07-12 13:33 ` [PATCH v2 0/7] net: phy: adin1100: Add initial support for ADIN1100 industrial PHY Russell King (Oracle)
2021-07-23 17:32   ` Oleksij Rempel
2021-08-03  9:47     ` alexandru.tachici
2021-08-03 11:59       ` Oleksij Rempel

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=20210712130631.38153-3-alexandru.tachici@analog.com \
    --to=alexandru.tachici@analog.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=hkallweit1@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.