Skip to content

Commit 7939693

Browse files
Russell King (Oracle)davem330
Russell King (Oracle)
authored and
davem330
committed
net: dsa: b53: convert to phylink_pcs
Convert B53 to use phylink_pcs for the serdes rather than hooking it into the MAC-layer callbacks. Fixes: 81c1681 ("net: dsa: b53: mark as non-legacy") Reviewed-by: Florian Fainelli <[email protected]> Tested-by: Florian Fainelli <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6b292a0 commit 7939693

File tree

5 files changed

+75
-72
lines changed

5 files changed

+75
-72
lines changed

‎drivers/net/dsa/b53/b53_common.c‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,46 +1354,25 @@ static void b53_phylink_get_caps(struct dsa_switch *ds, int port,
13541354
config->legacy_pre_march2020 = false;
13551355
}
13561356

1357-
int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,
1358-
struct phylink_link_state *state)
1357+
static struct phylink_pcs *b53_phylink_mac_select_pcs(struct dsa_switch *ds,
1358+
int port,
1359+
phy_interface_t interface)
13591360
{
13601361
struct b53_device *dev = ds->priv;
1361-
int ret = -EOPNOTSUPP;
13621362

1363-
if ((phy_interface_mode_is_8023z(state->interface) ||
1364-
state->interface == PHY_INTERFACE_MODE_SGMII) &&
1365-
dev->ops->serdes_link_state)
1366-
ret = dev->ops->serdes_link_state(dev, port, state);
1363+
if (!dev->ops->phylink_mac_select_pcs)
1364+
return NULL;
13671365

1368-
return ret;
1366+
return dev->ops->phylink_mac_select_pcs(dev, port, interface);
13691367
}
1370-
EXPORT_SYMBOL(b53_phylink_mac_link_state);
13711368

13721369
void b53_phylink_mac_config(struct dsa_switch *ds, int port,
13731370
unsigned int mode,
13741371
const struct phylink_link_state *state)
13751372
{
1376-
struct b53_device *dev = ds->priv;
1377-
1378-
if (mode == MLO_AN_PHY || mode == MLO_AN_FIXED)
1379-
return;
1380-
1381-
if ((phy_interface_mode_is_8023z(state->interface) ||
1382-
state->interface == PHY_INTERFACE_MODE_SGMII) &&
1383-
dev->ops->serdes_config)
1384-
dev->ops->serdes_config(dev, port, mode, state);
13851373
}
13861374
EXPORT_SYMBOL(b53_phylink_mac_config);
13871375

1388-
void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port)
1389-
{
1390-
struct b53_device *dev = ds->priv;
1391-
1392-
if (dev->ops->serdes_an_restart)
1393-
dev->ops->serdes_an_restart(dev, port);
1394-
}
1395-
EXPORT_SYMBOL(b53_phylink_mac_an_restart);
1396-
13971376
void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,
13981377
unsigned int mode,
13991378
phy_interface_t interface)
@@ -2269,9 +2248,8 @@ static const struct dsa_switch_ops b53_switch_ops = {
22692248
.phy_write = b53_phy_write16,
22702249
.adjust_link = b53_adjust_link,
22712250
.phylink_get_caps = b53_phylink_get_caps,
2272-
.phylink_mac_link_state = b53_phylink_mac_link_state,
2251+
.phylink_mac_select_pcs = b53_phylink_mac_select_pcs,
22732252
.phylink_mac_config = b53_phylink_mac_config,
2274-
.phylink_mac_an_restart = b53_phylink_mac_an_restart,
22752253
.phylink_mac_link_down = b53_phylink_mac_link_down,
22762254
.phylink_mac_link_up = b53_phylink_mac_link_up,
22772255
.port_enable = b53_enable_port,

‎drivers/net/dsa/b53/b53_priv.h‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121

2222
#include <linux/kernel.h>
2323
#include <linux/mutex.h>
24-
#include <linux/phy.h>
24+
#include <linux/phylink.h>
2525
#include <linux/etherdevice.h>
2626
#include <net/dsa.h>
2727

2828
#include "b53_regs.h"
2929

3030
struct b53_device;
3131
struct net_device;
32-
struct phylink_link_state;
3332

3433
struct b53_io_ops {
3534
int (*read8)(struct b53_device *dev, u8 page, u8 reg, u8 *value);
@@ -48,13 +47,10 @@ struct b53_io_ops {
4847
void (*irq_disable)(struct b53_device *dev, int port);
4948
void (*phylink_get_caps)(struct b53_device *dev, int port,
5049
struct phylink_config *config);
50+
struct phylink_pcs *(*phylink_mac_select_pcs)(struct b53_device *dev,
51+
int port,
52+
phy_interface_t interface);
5153
u8 (*serdes_map_lane)(struct b53_device *dev, int port);
52-
int (*serdes_link_state)(struct b53_device *dev, int port,
53-
struct phylink_link_state *state);
54-
void (*serdes_config)(struct b53_device *dev, int port,
55-
unsigned int mode,
56-
const struct phylink_link_state *state);
57-
void (*serdes_an_restart)(struct b53_device *dev, int port);
5854
void (*serdes_link_set)(struct b53_device *dev, int port,
5955
unsigned int mode, phy_interface_t interface,
6056
bool link_up);
@@ -85,8 +81,15 @@ enum {
8581
BCM7278_DEVICE_ID = 0x7278,
8682
};
8783

84+
struct b53_pcs {
85+
struct phylink_pcs pcs;
86+
struct b53_device *dev;
87+
u8 lane;
88+
};
89+
8890
#define B53_N_PORTS 9
8991
#define B53_N_PORTS_25 6
92+
#define B53_N_PCS 2
9093

9194
struct b53_port {
9295
u16 vlan_ctl_mask;
@@ -143,6 +146,8 @@ struct b53_device {
143146
bool vlan_enabled;
144147
unsigned int num_ports;
145148
struct b53_port *ports;
149+
150+
struct b53_pcs pcs[B53_N_PCS];
146151
};
147152

148153
#define b53_for_each_port(dev, i) \
@@ -336,12 +341,9 @@ int b53_br_flags(struct dsa_switch *ds, int port,
336341
struct netlink_ext_ack *extack);
337342
int b53_setup_devlink_resources(struct dsa_switch *ds);
338343
void b53_port_event(struct dsa_switch *ds, int port);
339-
int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,
340-
struct phylink_link_state *state);
341344
void b53_phylink_mac_config(struct dsa_switch *ds, int port,
342345
unsigned int mode,
343346
const struct phylink_link_state *state);
344-
void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port);
345347
void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,
346348
unsigned int mode,
347349
phy_interface_t interface);

‎drivers/net/dsa/b53/b53_serdes.c‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
#include "b53_serdes.h"
1818
#include "b53_regs.h"
1919

20+
static inline struct b53_pcs *pcs_to_b53_pcs(struct phylink_pcs *pcs)
21+
{
22+
return container_of(pcs, struct b53_pcs, pcs);
23+
}
24+
2025
static void b53_serdes_write_blk(struct b53_device *dev, u8 offset, u16 block,
2126
u16 value)
2227
{
@@ -60,51 +65,47 @@ static u16 b53_serdes_read(struct b53_device *dev, u8 lane,
6065
return b53_serdes_read_blk(dev, offset, block);
6166
}
6267

63-
void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,
64-
const struct phylink_link_state *state)
68+
static int b53_serdes_config(struct phylink_pcs *pcs, unsigned int mode,
69+
phy_interface_t interface,
70+
const unsigned long *advertising,
71+
bool permit_pause_to_mac)
6572
{
66-
u8 lane = b53_serdes_map_lane(dev, port);
73+
struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;
74+
u8 lane = pcs_to_b53_pcs(pcs)->lane;
6775
u16 reg;
6876

69-
if (lane == B53_INVALID_LANE)
70-
return;
71-
7277
reg = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),
7378
SERDES_DIGITAL_BLK);
74-
if (state->interface == PHY_INTERFACE_MODE_1000BASEX)
79+
if (interface == PHY_INTERFACE_MODE_1000BASEX)
7580
reg |= FIBER_MODE_1000X;
7681
else
7782
reg &= ~FIBER_MODE_1000X;
7883
b53_serdes_write(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),
7984
SERDES_DIGITAL_BLK, reg);
85+
86+
return 0;
8087
}
81-
EXPORT_SYMBOL(b53_serdes_config);
8288

83-
void b53_serdes_an_restart(struct b53_device *dev, int port)
89+
static void b53_serdes_an_restart(struct phylink_pcs *pcs)
8490
{
85-
u8 lane = b53_serdes_map_lane(dev, port);
91+
struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;
92+
u8 lane = pcs_to_b53_pcs(pcs)->lane;
8693
u16 reg;
8794

88-
if (lane == B53_INVALID_LANE)
89-
return;
90-
9195
reg = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMCR),
9296
SERDES_MII_BLK);
9397
reg |= BMCR_ANRESTART;
9498
b53_serdes_write(dev, lane, B53_SERDES_MII_REG(MII_BMCR),
9599
SERDES_MII_BLK, reg);
96100
}
97-
EXPORT_SYMBOL(b53_serdes_an_restart);
98101

99-
int b53_serdes_link_state(struct b53_device *dev, int port,
100-
struct phylink_link_state *state)
102+
static void b53_serdes_get_state(struct phylink_pcs *pcs,
103+
struct phylink_link_state *state)
101104
{
102-
u8 lane = b53_serdes_map_lane(dev, port);
105+
struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;
106+
u8 lane = pcs_to_b53_pcs(pcs)->lane;
103107
u16 dig, bmsr;
104108

105-
if (lane == B53_INVALID_LANE)
106-
return 1;
107-
108109
dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS,
109110
SERDES_DIGITAL_BLK);
110111
bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR),
@@ -133,10 +134,7 @@ int b53_serdes_link_state(struct b53_device *dev, int port,
133134
state->pause |= MLO_PAUSE_RX;
134135
if (dig & PAUSE_RESOLUTION_TX_SIDE)
135136
state->pause |= MLO_PAUSE_TX;
136-
137-
return 0;
138137
}
139-
EXPORT_SYMBOL(b53_serdes_link_state);
140138

141139
void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,
142140
phy_interface_t interface, bool link_up)
@@ -158,6 +156,12 @@ void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,
158156
}
159157
EXPORT_SYMBOL(b53_serdes_link_set);
160158

159+
static const struct phylink_pcs_ops b53_pcs_ops = {
160+
.pcs_get_state = b53_serdes_get_state,
161+
.pcs_config = b53_serdes_config,
162+
.pcs_an_restart = b53_serdes_an_restart,
163+
};
164+
161165
void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,
162166
struct phylink_config *config)
163167
{
@@ -187,9 +191,28 @@ void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,
187191
}
188192
EXPORT_SYMBOL(b53_serdes_phylink_get_caps);
189193

194+
struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,
195+
int port,
196+
phy_interface_t interface)
197+
{
198+
u8 lane = b53_serdes_map_lane(dev, port);
199+
200+
if (lane == B53_INVALID_LANE || lane >= B53_N_PCS ||
201+
!dev->pcs[lane].dev)
202+
return NULL;
203+
204+
if (!phy_interface_mode_is_8023z(interface) &&
205+
interface != PHY_INTERFACE_MODE_SGMII)
206+
return NULL;
207+
208+
return &dev->pcs[lane].pcs;
209+
}
210+
EXPORT_SYMBOL(b53_serdes_phylink_mac_select_pcs);
211+
190212
int b53_serdes_init(struct b53_device *dev, int port)
191213
{
192214
u8 lane = b53_serdes_map_lane(dev, port);
215+
struct b53_pcs *pcs;
193216
u16 id0, msb, lsb;
194217

195218
if (lane == B53_INVALID_LANE)
@@ -212,6 +235,11 @@ int b53_serdes_init(struct b53_device *dev, int port)
212235
(id0 >> SERDES_ID0_REV_NUM_SHIFT) & SERDES_ID0_REV_NUM_MASK,
213236
(u32)msb << 16 | lsb);
214237

238+
pcs = &dev->pcs[lane];
239+
pcs->dev = dev;
240+
pcs->lane = lane;
241+
pcs->pcs.ops = &b53_pcs_ops;
242+
215243
return 0;
216244
}
217245
EXPORT_SYMBOL(b53_serdes_init);

‎drivers/net/dsa/b53/b53_serdes.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,11 @@ static inline u8 b53_serdes_map_lane(struct b53_device *dev, int port)
107107
return dev->ops->serdes_map_lane(dev, port);
108108
}
109109

110-
int b53_serdes_get_link(struct b53_device *dev, int port);
111-
int b53_serdes_link_state(struct b53_device *dev, int port,
112-
struct phylink_link_state *state);
113-
void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,
114-
const struct phylink_link_state *state);
115-
void b53_serdes_an_restart(struct b53_device *dev, int port);
116110
void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,
117111
phy_interface_t interface, bool link_up);
112+
struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,
113+
int port,
114+
phy_interface_t interface);
118115
void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,
119116
struct phylink_config *config);
120117
#if IS_ENABLED(CONFIG_B53_SERDES)

‎drivers/net/dsa/b53/b53_srab.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,8 @@ static const struct b53_io_ops b53_srab_ops = {
491491
.irq_disable = b53_srab_irq_disable,
492492
.phylink_get_caps = b53_srab_phylink_get_caps,
493493
#if IS_ENABLED(CONFIG_B53_SERDES)
494+
.phylink_mac_select_pcs = b53_serdes_phylink_mac_select_pcs,
494495
.serdes_map_lane = b53_srab_serdes_map_lane,
495-
.serdes_link_state = b53_serdes_link_state,
496-
.serdes_config = b53_serdes_config,
497-
.serdes_an_restart = b53_serdes_an_restart,
498496
.serdes_link_set = b53_serdes_link_set,
499497
#endif
500498
};

0 commit comments

Comments
 (0)