Commit 55f13311 authored by Dan Murphy's avatar Dan Murphy Committed by David S. Miller
Browse files

ethtool: Add 100base-FX link mode entries 



Add entries for the 100base-FX full and half duplex supported modes.

$ ethtool eth0
        Supported ports: [ FIBRE ]
        Supported link modes:  100baseFX/Half 100baseFX/Full
        Supported pause frame use: Symmetric Receive-only
        Supports auto-negotiation: No
        Supported FEC modes: Not reported
        Advertised link modes: 100baseFX/Half 100baseFX/Full
        Advertised pause frame use: No
        Advertised auto-negotiation: No
        Advertised FEC modes: Not reported
        Speed: 100Mb/s
        Duplex: Full
        Auto-negotiation: off
        Port: MII
        PHYAD: 1
        Transceiver: external
        Supports Wake-on: gs
        Wake-on: d
        SecureOn password: 00:00:00:00:00:00
        Current message level: 0x00000000 (0)

        Link detected: yes

Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09599729

drivers/net/phy/phy-core.c

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


const char *phy_speed_to_str(int speed)

{

	BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 90,

	BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 92,

		"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");
@@ -160,6 +160,8 @@ static const struct phy_setting settings[] = { 
	PHY_SETTING(    100, FULL,    100baseT_Full		),

	PHY_SETTING(    100, FULL,    100baseT1_Full		),

	PHY_SETTING(    100, HALF,    100baseT_Half		),

	PHY_SETTING(    100, HALF,    100baseFX_Half		),

	PHY_SETTING(    100, FULL,    100baseFX_Full		),

	/* 10M */

	PHY_SETTING(     10, FULL,     10baseT_Full		),

	PHY_SETTING(     10, HALF,     10baseT_Half		),

include/uapi/linux/ethtool.h

+2 −0
Original line number Diff line number Diff line
@@ -1617,6 +1617,8 @@ enum ethtool_link_mode_bit_indices { 
	ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,

	ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT	 = 88,

	ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT	 = 89,

	ETHTOOL_LINK_MODE_100baseFX_Half_BIT		 = 90,

	ETHTOOL_LINK_MODE_100baseFX_Full_BIT		 = 91,

	/* must be last entry */

	__ETHTOOL_LINK_MODE_MASK_NBITS

};

net/ethtool/common.c

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ const char link_mode_names[][ETH_GSTRING_LEN] = { 
	__DEFINE_LINK_MODE_NAME(400000, LR4_ER4_FR4, Full),

	__DEFINE_LINK_MODE_NAME(400000, DR4, Full),

	__DEFINE_LINK_MODE_NAME(400000, CR4, Full),

	__DEFINE_LINK_MODE_NAME(100, FX, Half),

	__DEFINE_LINK_MODE_NAME(100, FX, Full),

};

static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);

net/ethtool/linkmodes.c

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static const struct link_mode_info link_mode_params[] = { 
	__DEFINE_LINK_MODE_PARAMS(400000, LR4_ER4_FR4, Full),

	__DEFINE_LINK_MODE_PARAMS(400000, DR4, Full),

	__DEFINE_LINK_MODE_PARAMS(400000, CR4, Full),

	__DEFINE_LINK_MODE_PARAMS(100, FX, Half),

	__DEFINE_LINK_MODE_PARAMS(100, FX, Full),

};



static const struct nla_policy