| Message ID | 20190225113955.25700-2-marek.behun@nic.cz |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,resend,1/2] net: dsa: mv88e6xxx: Default CMODE to 1000BaseX only on 6390X | expand |
From: Marek Behún <marek.behun@nic.cz> Date: Mon, 25 Feb 2019 12:39:54 +0100 > Commit 787799a9d555 sets the SERDES interfaces of 6390 and 6390X to > 1000BaseX, but this is only needed on 6390X, since there are SERDES > interfaces which can be used on lower ports on 6390. > > This commit fixes this by returning to previous behaviour on 6390. > (Previous behaviour means that CMODE is not set at all if requested mode > is NA). > > This is needed on Turris MOX, where the 88e6190 is connected to CPU in > 2500BaseX mode. > > Fixes: 787799a9d555 ("net: dsa: mv88e6xxx: Default ports 9/10 6390X CMODE to 1000BaseX") > Signed-off-by: Marek Behún <marek.behun@nic.cz> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Applied.
diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index ebd26b6a93e6..ee7029f4ee22 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -444,6 +444,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode) { switch (mode) { + case PHY_INTERFACE_MODE_NA: + return 0; case PHY_INTERFACE_MODE_XGMII: case PHY_INTERFACE_MODE_XAUI: case PHY_INTERFACE_MODE_RXAUI:
Commit 787799a9d555 sets the SERDES interfaces of 6390 and 6390X to 1000BaseX, but this is only needed on 6390X, since there are SERDES interfaces which can be used on lower ports on 6390. This commit fixes this by returning to previous behaviour on 6390. (Previous behaviour means that CMODE is not set at all if requested mode is NA). This is needed on Turris MOX, where the 88e6190 is connected to CPU in 2500BaseX mode. Fixes: 787799a9d555 ("net: dsa: mv88e6xxx: Default ports 9/10 6390X CMODE to 1000BaseX") Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/dsa/mv88e6xxx/port.c | 2 ++ 1 file changed, 2 insertions(+)