Skip to content

Commit 787799a

Browse files
lunndavem330
authored andcommitted
net: dsa: mv88e6xxx: Default ports 9/10 6390X CMODE to 1000BaseX
The 6390X family has 8 SERDES interfaces. This allows ports 9 and 10 to support up to 10Gbps using 4 SERDES interfaces. However, when lower speeds are used, which need fewer SERDES interfaces, the unused SERDES interfaces can be used by ports 2-8. The hardware defaults to ports 9 and 10 having all 4 SERDES interfaces assigned to them. This only gets changed when the interface is configured after what the SFP supports has been determined, or the 10G PHY completes auto-neg. For hardware designs which limit ports 9 and 10 to one or two SERDES interfaces, and place SFPs on the lower interfaces, this is too late. Those ports with SFP should not wait until ports 9/10 are up in order to get access to the SERDES interface. So change the default configuration when the driver is initialised. Configure ports 9 and 10 to 1000BaseX, so they use a single SERDES interface, freeing up the others. They can steal them back if they need them. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent fdc71ee commit 787799a

File tree

1 file changed

+6
-3
lines changed
  • drivers/net/dsa/mv88e6xxx

1 file changed

+6
-3
lines changed

drivers/net/dsa/mv88e6xxx/port.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,15 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
368368
u16 reg;
369369
int err;
370370

371-
if (mode == PHY_INTERFACE_MODE_NA)
372-
return 0;
373-
374371
if (port != 9 && port != 10)
375372
return -EOPNOTSUPP;
376373

374+
/* Default to a slow mode, so freeing up SERDES interfaces for
375+
* other ports which might use them for SFPs.
376+
*/
377+
if (mode == PHY_INTERFACE_MODE_NA)
378+
mode = PHY_INTERFACE_MODE_1000BASEX;
379+
377380
switch (mode) {
378381
case PHY_INTERFACE_MODE_1000BASEX:
379382
cmode = MV88E6XXX_PORT_STS_CMODE_1000BASE_X;

0 commit comments

Comments
 (0)