Commit c0103729 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'add-100-base-x-mode' 

Bjarni Jonasson says:

====================
Add 100 base-x mode

Adding support for 100 base-x in phylink.
The Sparx5 switch supports 100 base-x pcs (IEEE 802.3 Clause 24) 4b5b encoded.
These patches adds phylink support for that mode.

Tested in Sparx5, using sfp modules:
Axcen 100fx AXFE-1314-0521 (base-fx)
Axcen 100lx AXFE-1314-0551 (base-lx)
HP SFP 100FX J9054C (bx-10)
Excom SFP-SX-M1002 (base-lx)

v1 -> v2:
  Added description to Documentation/networking/phy.rst
  Moved PHY_INTERFACE_MODE_100BASEX to above 1000BASEX
  Patching against net-next
====================

Link: https://lore.kernel.org/r/20210113115626.17381-1-bjarni.jonasson@microchip.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3c51fa5d 6e12f35c

Documentation/networking/phy.rst

+5 −0
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ Some of the interface modes are described below: 
    Note: due to legacy usage, some 10GBASE-R usage incorrectly makes

    use of this definition.



``PHY_INTERFACE_MODE_100BASEX``

    This defines IEEE 802.3 Clause 24.  The link operates at a fixed data

    rate of 125Mpbs using a 4B/5B encoding scheme, resulting in an underlying

    data rate of 100Mpbs.



Pause frames / flow control

===========================

drivers/net/phy/sfp-bus.c

+9 −0
Original line number Diff line number Diff line
@@ -265,6 +265,12 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id, 
	    br_min <= 1300 && br_max >= 1200)

		phylink_set(modes, 1000baseX_Full);



	/* 100Base-FX, 100Base-LX, 100Base-PX, 100Base-BX10 */

	if (id->base.e100_base_fx || id->base.e100_base_lx)

		phylink_set(modes, 100baseFX_Full);

	if ((id->base.e_base_px || id->base.e_base_bx10) && br_nom == 100)

		phylink_set(modes, 100baseFX_Full);



	/* For active or passive cables, select the link modes

	 * based on the bit rates and the cable compliance bytes.

	 */
@@ -389,6 +395,9 @@ phy_interface_t sfp_select_interface(struct sfp_bus *bus, 
	if (phylink_test(link_modes, 1000baseX_Full))

		return PHY_INTERFACE_MODE_1000BASEX;



	if (phylink_test(link_modes, 100baseFX_Full))

		return PHY_INTERFACE_MODE_100BASEX;



	dev_warn(bus->sfp_dev, "Unable to ascertain link mode\n");



	return PHY_INTERFACE_MODE_NA;

include/linux/phy.h

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ extern const int phy_10gbit_features_array[1]; 
 * @PHY_INTERFACE_MODE_MOCA: Multimedia over Coax

 * @PHY_INTERFACE_MODE_QSGMII: Quad SGMII

 * @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII

 * @PHY_INTERFACE_MODE_100BASEX: 100 BaseX

 * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX

 * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX

 * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI
@@ -135,6 +136,7 @@ typedef enum { 
	PHY_INTERFACE_MODE_MOCA,

	PHY_INTERFACE_MODE_QSGMII,

	PHY_INTERFACE_MODE_TRGMII,

	PHY_INTERFACE_MODE_100BASEX,

	PHY_INTERFACE_MODE_1000BASEX,

	PHY_INTERFACE_MODE_2500BASEX,

	PHY_INTERFACE_MODE_RXAUI,
@@ -217,6 +219,8 @@ static inline const char *phy_modes(phy_interface_t interface) 
		return "usxgmii";

	case PHY_INTERFACE_MODE_10GKR:

		return "10gbase-kr";

	case PHY_INTERFACE_MODE_100BASEX:

		return "100base-x";

	default:

		return "unknown";

	}