ethtool: Add 10base-T1L link mode entry

Add entry for the 10base-T1L full duplex mode.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 2001f3329133361f2ba2fc895a13c6ee45a1f7fc..1f2531a1a87672cf0e59fffa15f59415728c3a02 100644 (file)
--- 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 != 92,
+       BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 93,
                "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");
@@ -176,6 +176,7 @@ static const struct phy_setting settings[] = {
        /* 10M */
        PHY_SETTING(     10, FULL,     10baseT_Full             ),
        PHY_SETTING(     10, HALF,     10baseT_Half             ),
+       PHY_SETTING(     10, FULL,     10baseT1L_Full           ),
 };
 #undef PHY_SETTING
 

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f867042b2eb4b4c7dd3fc55abfb855a6e262084d..1369daeded14ad6aff7bcd6002ed2558b48ead01 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -90,8 +90,9 @@ const int phy_10_100_features_array[4] = {
 };
 EXPORT_SYMBOL_GPL(phy_10_100_features_array);
 
-const int phy_basic_t1_features_array[2] = {
+const int phy_basic_t1_features_array[3] = {
        ETHTOOL_LINK_MODE_TP_BIT,
+       ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,
        ETHTOOL_LINK_MODE_100baseT1_Full_BIT,
 };
 EXPORT_SYMBOL_GPL(phy_basic_t1_features_array);

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 33c285252584508beebf517d4e3dce8ef25d70bc..d707604d1d5ab5c0561ed25a43e264a87a229105 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -168,8 +168,10 @@ static void phylink_caps_to_linkmodes(unsigned long *linkmodes,
        if (caps & MAC_10HD)
                __set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, linkmodes);
 
-       if (caps & MAC_10FD)
+       if (caps & MAC_10FD) {
                __set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, linkmodes);
+               __set_bit(ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, linkmodes);
+       }
 
        if (caps & MAC_100HD) {
                __set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, linkmodes);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 36ca2b5c22533c2ea3e34081db0c4a19a1a3d4f2..b12af9e2f38936b578bc3a004036b474b5365304 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -65,7 +65,7 @@ extern const int phy_basic_ports_array[3];
 extern const int phy_fibre_port_array[1];
 extern const int phy_all_ports_features_array[7];
 extern const int phy_10_100_features_array[4];
-extern const int phy_basic_t1_features_array[2];
+extern const int phy_basic_t1_features_array[3];
 extern const int phy_gbit_features_array[2];
 extern const int phy_10gbit_features_array[1];
 

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 7bc4b8def12c928c249239aa8037e2ad976641fb..e0f0ee9bc89e6bfb3c731d72690db4d24f3d44b1 100644 (file)
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1691,6 +1691,7 @@ enum ethtool_link_mode_bit_indices {
        ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT         = 89,
        ETHTOOL_LINK_MODE_100baseFX_Half_BIT             = 90,
        ETHTOOL_LINK_MODE_100baseFX_Full_BIT             = 91,
+       ETHTOOL_LINK_MODE_10baseT1L_Full_BIT             = 92,
        /* must be last entry */
        __ETHTOOL_LINK_MODE_MASK_NBITS
 };

diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index 0c52100159111fc6c777ea8cdc9e9195ee0c68e6..566adf85e658d76f83a0934acde4c0eb1a9d78b1 100644 (file)
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -201,6 +201,7 @@ const char link_mode_names[][ETH_GSTRING_LEN] = {
        __DEFINE_LINK_MODE_NAME(400000, CR4, Full),
        __DEFINE_LINK_MODE_NAME(100, FX, Half),
        __DEFINE_LINK_MODE_NAME(100, FX, Full),
+       __DEFINE_LINK_MODE_NAME(10, T1L, Full),
 };
 static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 
@@ -236,6 +237,7 @@ static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 #define __LINK_MODE_LANES_T1           1
 #define __LINK_MODE_LANES_X            1
 #define __LINK_MODE_LANES_FX           1
+#define __LINK_MODE_LANES_T1L          1
 
 #define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex)      \
        [ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = {         \
@@ -349,6 +351,7 @@ 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_LINK_MODE_PARAMS(10, T1L, Full),
 };
 static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);