Skip to content

Commit 6335e9f

Browse files
lunndavem330
lunn
authored and
davem330
committed
net: dsa: mv88e6xxx: mv88e6390X SERDES support
The mv88e6390X family has 8 SERDES lanes. These can be used for 2 10Gbps ports, ports 9 or 10. If these ports are used at slower speeds, the SERDES lanes become available for other ports for 1000Base-X. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ba9b989 commit 6335e9f

File tree

3 files changed

+184
-0
lines changed

3 files changed

+184
-0
lines changed

‎drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2757,6 +2757,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
27572757
.reset = mv88e6352_g1_reset,
27582758
.vtu_getnext = mv88e6390_g1_vtu_getnext,
27592759
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
2760+
.serdes_power = mv88e6390_serdes_power,
27602761
};
27612762

27622763
static const struct mv88e6xxx_ops mv88e6190x_ops = {
@@ -2789,6 +2790,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
27892790
.reset = mv88e6352_g1_reset,
27902791
.vtu_getnext = mv88e6390_g1_vtu_getnext,
27912792
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
2793+
.serdes_power = mv88e6390_serdes_power,
27922794
};
27932795

27942796
static const struct mv88e6xxx_ops mv88e6191_ops = {
@@ -2821,6 +2823,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
28212823
.reset = mv88e6352_g1_reset,
28222824
.vtu_getnext = mv88e6390_g1_vtu_getnext,
28232825
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
2826+
.serdes_power = mv88e6390_serdes_power,
28242827
};
28252828

28262829
static const struct mv88e6xxx_ops mv88e6240_ops = {
@@ -2888,6 +2891,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
28882891
.reset = mv88e6352_g1_reset,
28892892
.vtu_getnext = mv88e6390_g1_vtu_getnext,
28902893
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
2894+
.serdes_power = mv88e6390_serdes_power,
28912895
};
28922896

28932897
static const struct mv88e6xxx_ops mv88e6320_ops = {
@@ -3113,6 +3117,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
31133117
.reset = mv88e6352_g1_reset,
31143118
.vtu_getnext = mv88e6390_g1_vtu_getnext,
31153119
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
3120+
.serdes_power = mv88e6390_serdes_power,
31163121
};
31173122

31183123
static const struct mv88e6xxx_ops mv88e6390x_ops = {
@@ -3147,6 +3152,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
31473152
.reset = mv88e6352_g1_reset,
31483153
.vtu_getnext = mv88e6390_g1_vtu_getnext,
31493154
.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
3155+
.serdes_power = mv88e6390_serdes_power,
31503156
};
31513157

31523158
static const struct mv88e6xxx_info mv88e6xxx_table[] = {

‎drivers/net/dsa/mv88e6xxx/serdes.c

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include <linux/mii.h>
1515

16+
#include "global2.h"
1617
#include "mv88e6xxx.h"
1718
#include "phy.h"
1819
#include "port.h"
@@ -73,3 +74,156 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
7374

7475
return 0;
7576
}
77+
78+
/* Set the power on/off for 10GBASE-R and 10GBASE-X4/X2 */
79+
static int mv88e6390_serdes_10g(struct mv88e6xxx_chip *chip, int addr, bool on)
80+
{
81+
u16 val, new_val;
82+
int reg_c45;
83+
int err;
84+
85+
reg_c45 = MII_ADDR_C45 | MV88E6390_SERDES_DEVICE |
86+
MV88E6390_PCS_CONTROL_1;
87+
err = mv88e6xxx_phy_read(chip, addr, reg_c45, &val);
88+
if (err)
89+
return err;
90+
91+
if (on)
92+
new_val = val & ~(MV88E6390_PCS_CONTROL_1_RESET |
93+
MV88E6390_PCS_CONTROL_1_LOOPBACK |
94+
MV88E6390_PCS_CONTROL_1_PDOWN);
95+
else
96+
new_val = val | MV88E6390_PCS_CONTROL_1_PDOWN;
97+
98+
if (val != new_val)
99+
err = mv88e6xxx_phy_write(chip, addr, reg_c45, new_val);
100+
101+
return err;
102+
}
103+
104+
/* Set the power on/off for 10GBASE-R and 10GBASE-X4/X2 */
105+
static int mv88e6390_serdes_sgmii(struct mv88e6xxx_chip *chip, int addr,
106+
bool on)
107+
{
108+
u16 val, new_val;
109+
int reg_c45;
110+
int err;
111+
112+
reg_c45 = MII_ADDR_C45 | MV88E6390_SERDES_DEVICE |
113+
MV88E6390_SGMII_CONTROL;
114+
err = mv88e6xxx_phy_read(chip, addr, reg_c45, &val);
115+
if (err)
116+
return err;
117+
118+
if (on)
119+
new_val = val & ~(MV88E6390_SGMII_CONTROL_RESET |
120+
MV88E6390_SGMII_CONTROL_LOOPBACK |
121+
MV88E6390_SGMII_CONTROL_PDOWN);
122+
else
123+
new_val = val | MV88E6390_SGMII_CONTROL_PDOWN;
124+
125+
if (val != new_val)
126+
err = mv88e6xxx_phy_write(chip, addr, reg_c45, new_val);
127+
128+
return err;
129+
}
130+
131+
static int mv88e6390_serdes_lower(struct mv88e6xxx_chip *chip, u8 cmode,
132+
int port_donor, int lane, bool rxaui, bool on)
133+
{
134+
int err;
135+
u8 cmode_donor;
136+
137+
err = mv88e6xxx_port_get_cmode(chip, port_donor, &cmode_donor);
138+
if (err)
139+
return err;
140+
141+
switch (cmode_donor) {
142+
case PORT_STATUS_CMODE_RXAUI:
143+
if (!rxaui)
144+
break;
145+
/* Fall through */
146+
case PORT_STATUS_CMODE_1000BASE_X:
147+
case PORT_STATUS_CMODE_SGMII:
148+
case PORT_STATUS_CMODE_2500BASEX:
149+
if (cmode == PORT_STATUS_CMODE_1000BASE_X ||
150+
cmode == PORT_STATUS_CMODE_SGMII)
151+
return mv88e6390_serdes_sgmii(chip, lane, on);
152+
}
153+
return 0;
154+
}
155+
156+
static int mv88e6390_serdes_port9(struct mv88e6xxx_chip *chip, u8 cmode,
157+
bool on)
158+
{
159+
switch (cmode) {
160+
case PORT_STATUS_CMODE_1000BASE_X:
161+
case PORT_STATUS_CMODE_SGMII:
162+
return mv88e6390_serdes_sgmii(chip, MV88E6390_PORT9_LANE0, on);
163+
case PORT_STATUS_CMODE_XAUI:
164+
case PORT_STATUS_CMODE_RXAUI:
165+
case PORT_STATUS_CMODE_2500BASEX:
166+
return mv88e6390_serdes_10g(chip, MV88E6390_PORT9_LANE0, on);
167+
}
168+
169+
return 0;
170+
}
171+
172+
static int mv88e6390_serdes_port10(struct mv88e6xxx_chip *chip, u8 cmode,
173+
bool on)
174+
{
175+
switch (cmode) {
176+
case PORT_STATUS_CMODE_SGMII:
177+
return mv88e6390_serdes_sgmii(chip, MV88E6390_PORT10_LANE0, on);
178+
case PORT_STATUS_CMODE_XAUI:
179+
case PORT_STATUS_CMODE_RXAUI:
180+
case PORT_STATUS_CMODE_1000BASE_X:
181+
case PORT_STATUS_CMODE_2500BASEX:
182+
return mv88e6390_serdes_10g(chip, MV88E6390_PORT10_LANE0, on);
183+
}
184+
185+
return 0;
186+
}
187+
188+
int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
189+
{
190+
u8 cmode;
191+
int err;
192+
193+
err = mv88e6xxx_port_get_cmode(chip, port, &cmode);
194+
if (err)
195+
return cmode;
196+
197+
switch (port) {
198+
case 2:
199+
return mv88e6390_serdes_lower(chip, cmode, 9,
200+
MV88E6390_PORT9_LANE1,
201+
false, on);
202+
case 3:
203+
return mv88e6390_serdes_lower(chip, cmode, 9,
204+
MV88E6390_PORT9_LANE2,
205+
true, on);
206+
case 4:
207+
return mv88e6390_serdes_lower(chip, cmode, 9,
208+
MV88E6390_PORT9_LANE3,
209+
true, on);
210+
case 5:
211+
return mv88e6390_serdes_lower(chip, cmode, 10,
212+
MV88E6390_PORT10_LANE1,
213+
false, on);
214+
case 6:
215+
return mv88e6390_serdes_lower(chip, cmode, 10,
216+
MV88E6390_PORT10_LANE2,
217+
true, on);
218+
case 7:
219+
return mv88e6390_serdes_lower(chip, cmode, 10,
220+
MV88E6390_PORT10_LANE3,
221+
true, on);
222+
case 9:
223+
return mv88e6390_serdes_port9(chip, cmode, on);
224+
case 10:
225+
return mv88e6390_serdes_port10(chip, cmode, on);
226+
}
227+
228+
return 0;
229+
}

‎drivers/net/dsa/mv88e6xxx/serdes.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,30 @@
1919
#define MV88E6352_ADDR_SERDES 0x0f
2020
#define MV88E6352_SERDES_PAGE_FIBER 0x01
2121

22+
#define MV88E6390_PORT9_LANE0 0x09
23+
#define MV88E6390_PORT9_LANE1 0x12
24+
#define MV88E6390_PORT9_LANE2 0x13
25+
#define MV88E6390_PORT9_LANE3 0x14
26+
#define MV88E6390_PORT10_LANE0 0x0a
27+
#define MV88E6390_PORT10_LANE1 0x15
28+
#define MV88E6390_PORT10_LANE2 0x16
29+
#define MV88E6390_PORT10_LANE3 0x17
30+
#define MV88E6390_SERDES_DEVICE (4 << 16)
31+
32+
/* 10GBASE-R and 10GBASE-X4/X2 */
33+
#define MV88E6390_PCS_CONTROL_1 0x1000
34+
#define MV88E6390_PCS_CONTROL_1_RESET BIT(15)
35+
#define MV88E6390_PCS_CONTROL_1_LOOPBACK BIT(14)
36+
#define MV88E6390_PCS_CONTROL_1_SPEED BIT(13)
37+
#define MV88E6390_PCS_CONTROL_1_PDOWN BIT(11)
38+
39+
/* 1000BASE-X and SGMII */
40+
#define MV88E6390_SGMII_CONTROL 0x2000
41+
#define MV88E6390_SGMII_CONTROL_RESET BIT(15)
42+
#define MV88E6390_SGMII_CONTROL_LOOPBACK BIT(14)
43+
#define MV88E6390_SGMII_CONTROL_PDOWN BIT(11)
44+
2245
int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
46+
int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
2347

2448
#endif

0 commit comments

Comments
 (0)