Commit 6f616757 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: felix: support phy-mode = "10g-qxgmii" 



The "usxgmii" phy-mode that the Felix switch ports support on LS1028A is
not quite USXGMII, it is defined by the USXGMII multiport specification
document as 10G-QXGMII. It uses the same signaling as USXGMII, but it
multiplexes 4 ports over the link, resulting in a maximum speed of 2.5G
per port.

This change is needed in preparation for the lynx-10g SerDes driver on
LS1028A, which will make a more clear distinction between usxgmii
(supported on lane 0) and 10g-qxgmii (supported on lane 1). These
protocols have their configuration in different PCCR registers (PCCRB vs
PCCR9).

Continue parsing and supporting single-port-per-lane USXGMII when found
in the device tree as usual (because it works), but add support for
10G-QXGMII too. Using phy-mode = "10g-qxgmii" will be required when
modifying the device trees to specify a "phys" phandle to the SerDes
lane. The result when the "phys" phandle is present but the phy-mode is
wrong is undefined.

The only PHY driver in known use with this phy-mode, AQR412C, will gain
logic to transition from "usxgmii" to "10g-qxgmii" in a future change.
Prepare the driver by also setting PHY_INTERFACE_MODE_10G_QXGMII in
supported_interfaces when PHY_INTERFACE_MODE_USXGMII is there, to
prevent breakage with existing device trees.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250903130730.2836022-3-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 76cd8a2e

drivers/net/dsa/ocelot/felix.c

+4 −0
Original line number Diff line number Diff line
@@ -1153,6 +1153,9 @@ static void felix_phylink_get_caps(struct dsa_switch *ds, int port, 


	__set_bit(ocelot->ports[port]->phy_mode,

		  config->supported_interfaces);

	if (ocelot->ports[port]->phy_mode == PHY_INTERFACE_MODE_USXGMII)

		__set_bit(PHY_INTERFACE_MODE_10G_QXGMII,

			  config->supported_interfaces);

}



static void felix_phylink_mac_config(struct phylink_config *config,
@@ -1359,6 +1362,7 @@ static const u32 felix_phy_match_table[PHY_INTERFACE_MODE_MAX] = { 
	[PHY_INTERFACE_MODE_SGMII] = OCELOT_PORT_MODE_SGMII,

	[PHY_INTERFACE_MODE_QSGMII] = OCELOT_PORT_MODE_QSGMII,

	[PHY_INTERFACE_MODE_USXGMII] = OCELOT_PORT_MODE_USXGMII,

	[PHY_INTERFACE_MODE_10G_QXGMII] = OCELOT_PORT_MODE_10G_QXGMII,

	[PHY_INTERFACE_MODE_1000BASEX] = OCELOT_PORT_MODE_1000BASEX,

	[PHY_INTERFACE_MODE_2500BASEX] = OCELOT_PORT_MODE_2500BASEX,

};

drivers/net/dsa/ocelot/felix.h

+2 −1
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 
#define OCELOT_PORT_MODE_SGMII		BIT(1)

#define OCELOT_PORT_MODE_QSGMII		BIT(2)

#define OCELOT_PORT_MODE_2500BASEX	BIT(3)

#define OCELOT_PORT_MODE_USXGMII	BIT(4)

#define OCELOT_PORT_MODE_USXGMII	BIT(4) /* compatibility */

#define OCELOT_PORT_MODE_1000BASEX	BIT(5)

#define OCELOT_PORT_MODE_10G_QXGMII	BIT(6)



struct device_node;

drivers/net/dsa/ocelot/felix_vsc9959.c

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
					 OCELOT_PORT_MODE_QSGMII | \

					 OCELOT_PORT_MODE_1000BASEX | \

					 OCELOT_PORT_MODE_2500BASEX | \

					 OCELOT_PORT_MODE_USXGMII)

					 OCELOT_PORT_MODE_USXGMII | \

					 OCELOT_PORT_MODE_10G_QXGMII)



static const u32 vsc9959_port_modes[VSC9959_NUM_PORTS] = {

	VSC9959_PORT_MODE_SERDES,