Skip to content

Commit 34dd171

Browse files
vkochan-plvdavem330
vkochan-plv
authored and
davem330
committed
net: marvell: prestera: Add basic devlink support
Add very basic support for devlink interface: - driver name - fw version - devlink ports Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 4c2703d commit 34dd171

File tree

6 files changed

+165
-5
lines changed

6 files changed

+165
-5
lines changed

‎drivers/net/ethernet/marvell/prestera/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
config PRESTERA
77
tristate "Marvell Prestera Switch ASICs support"
88
depends on NET_SWITCHDEV && VLAN_8021Q
9+
select NET_DEVLINK
910
help
1011
This driver supports Marvell Prestera Switch ASICs family.
1112

‎drivers/net/ethernet/marvell/prestera/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_PRESTERA) += prestera.o
33
prestera-objs := prestera_main.o prestera_hw.o prestera_dsa.o \
4-
prestera_rxtx.o
4+
prestera_rxtx.o prestera_devlink.o
55

66
obj-$(CONFIG_PRESTERA_PCI) += prestera_pci.o

‎drivers/net/ethernet/marvell/prestera/prestera.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
#include <linux/notifier.h>
88
#include <linux/skbuff.h>
99
#include <linux/workqueue.h>
10+
#include <net/devlink.h>
1011
#include <uapi/linux/if_ether.h>
1112

13+
#define PRESTERA_DRV_NAME "prestera"
14+
1215
struct prestera_fw_rev {
1316
u16 maj;
1417
u16 min;
@@ -58,6 +61,7 @@ struct prestera_port_caps {
5861
struct prestera_port {
5962
struct net_device *dev;
6063
struct prestera_switch *sw;
64+
struct devlink_port dl_port;
6165
u32 id;
6266
u32 hw_id;
6367
u32 dev_id;

‎drivers/net/ethernet/marvell/prestera/prestera_devlink.c‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
2+
/* Copyright (c) 2019-2020 Marvell International Ltd. All rights reserved */
3+
4+
#include <net/devlink.h>
5+
6+
#include "prestera_devlink.h"
7+
8+
static int prestera_dl_info_get(struct devlink *dl,
9+
struct devlink_info_req *req,
10+
struct netlink_ext_ack *extack)
11+
{
12+
struct prestera_switch *sw = devlink_priv(dl);
13+
char buf[16];
14+
int err;
15+
16+
err = devlink_info_driver_name_put(req, PRESTERA_DRV_NAME);
17+
if (err)
18+
return err;
19+
20+
snprintf(buf, sizeof(buf), "%d.%d.%d",
21+
sw->dev->fw_rev.maj,
22+
sw->dev->fw_rev.min,
23+
sw->dev->fw_rev.sub);
24+
25+
return devlink_info_version_running_put(req,
26+
DEVLINK_INFO_VERSION_GENERIC_FW,
27+
buf);
28+
}
29+
30+
static const struct devlink_ops prestera_dl_ops = {
31+
.info_get = prestera_dl_info_get,
32+
};
33+
34+
struct prestera_switch *prestera_devlink_alloc(void)
35+
{
36+
struct devlink *dl;
37+
38+
dl = devlink_alloc(&prestera_dl_ops, sizeof(struct prestera_switch));
39+
40+
return devlink_priv(dl);
41+
}
42+
43+
void prestera_devlink_free(struct prestera_switch *sw)
44+
{
45+
struct devlink *dl = priv_to_devlink(sw);
46+
47+
devlink_free(dl);
48+
}
49+
50+
int prestera_devlink_register(struct prestera_switch *sw)
51+
{
52+
struct devlink *dl = priv_to_devlink(sw);
53+
int err;
54+
55+
err = devlink_register(dl, sw->dev->dev);
56+
if (err)
57+
dev_err(prestera_dev(sw), "devlink_register failed: %d\n", err);
58+
59+
return err;
60+
}
61+
62+
void prestera_devlink_unregister(struct prestera_switch *sw)
63+
{
64+
struct devlink *dl = priv_to_devlink(sw);
65+
66+
devlink_unregister(dl);
67+
}
68+
69+
int prestera_devlink_port_register(struct prestera_port *port)
70+
{
71+
struct prestera_switch *sw = port->sw;
72+
struct devlink *dl = priv_to_devlink(sw);
73+
struct devlink_port_attrs attrs = {};
74+
int err;
75+
76+
attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
77+
attrs.phys.port_number = port->fp_id;
78+
attrs.switch_id.id_len = sizeof(sw->id);
79+
memcpy(attrs.switch_id.id, &sw->id, attrs.switch_id.id_len);
80+
81+
devlink_port_attrs_set(&port->dl_port, &attrs);
82+
83+
err = devlink_port_register(dl, &port->dl_port, port->fp_id);
84+
if (err) {
85+
dev_err(prestera_dev(sw), "devlink_port_register failed: %d\n", err);
86+
return err;
87+
}
88+
89+
return 0;
90+
}
91+
92+
void prestera_devlink_port_unregister(struct prestera_port *port)
93+
{
94+
devlink_port_unregister(&port->dl_port);
95+
}
96+
97+
void prestera_devlink_port_set(struct prestera_port *port)
98+
{
99+
devlink_port_type_eth_set(&port->dl_port, port->dev);
100+
}
101+
102+
void prestera_devlink_port_clear(struct prestera_port *port)
103+
{
104+
devlink_port_type_clear(&port->dl_port);
105+
}
106+
107+
struct devlink_port *prestera_devlink_get_port(struct net_device *dev)
108+
{
109+
struct prestera_port *port = netdev_priv(dev);
110+
111+
return &port->dl_port;
112+
}

‎drivers/net/ethernet/marvell/prestera/prestera_devlink.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
2+
/* Copyright (c) 2019-2020 Marvell International Ltd. All rights reserved. */
3+
4+
#ifndef _PRESTERA_DEVLINK_H_
5+
#define _PRESTERA_DEVLINK_H_
6+
7+
#include "prestera.h"
8+
9+
struct prestera_switch *prestera_devlink_alloc(void);
10+
void prestera_devlink_free(struct prestera_switch *sw);
11+
12+
int prestera_devlink_register(struct prestera_switch *sw);
13+
void prestera_devlink_unregister(struct prestera_switch *sw);
14+
15+
int prestera_devlink_port_register(struct prestera_port *port);
16+
void prestera_devlink_port_unregister(struct prestera_port *port);
17+
18+
void prestera_devlink_port_set(struct prestera_port *port);
19+
void prestera_devlink_port_clear(struct prestera_port *port);
20+
21+
struct devlink_port *prestera_devlink_get_port(struct net_device *dev);
22+
23+
#endif /* _PRESTERA_DEVLINK_H_ */

‎drivers/net/ethernet/marvell/prestera/prestera_main.c‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "prestera.h"
1313
#include "prestera_hw.h"
1414
#include "prestera_rxtx.h"
15+
#include "prestera_devlink.h"
1516

1617
#define PRESTERA_MTU_DEFAULT 1536
1718

@@ -186,6 +187,7 @@ static const struct net_device_ops prestera_netdev_ops = {
186187
.ndo_change_mtu = prestera_port_change_mtu,
187188
.ndo_get_stats64 = prestera_port_get_stats64,
188189
.ndo_set_mac_address = prestera_port_set_mac_address,
190+
.ndo_get_devlink_port = prestera_devlink_get_port,
189191
};
190192

191193
static int prestera_port_autoneg_set(struct prestera_port *port, bool enable,
@@ -250,9 +252,13 @@ static int prestera_port_create(struct prestera_switch *sw, u32 id)
250252
&port->fp_id);
251253
if (err) {
252254
dev_err(prestera_dev(sw), "Failed to get port(%u) info\n", id);
253-
goto err_port_init;
255+
goto err_port_info_get;
254256
}
255257

258+
err = prestera_devlink_port_register(port);
259+
if (err)
260+
goto err_dl_port_register;
261+
256262
dev->features |= NETIF_F_NETNS_LOCAL;
257263
dev->netdev_ops = &prestera_netdev_ops;
258264

@@ -313,11 +319,16 @@ static int prestera_port_create(struct prestera_switch *sw, u32 id)
313319
if (err)
314320
goto err_register_netdev;
315321

322+
prestera_devlink_port_set(port);
323+
316324
return 0;
317325

318326
err_register_netdev:
319327
prestera_port_list_del(port);
320328
err_port_init:
329+
prestera_devlink_port_unregister(port);
330+
err_dl_port_register:
331+
err_port_info_get:
321332
free_netdev(dev);
322333
return err;
323334
}
@@ -327,8 +338,10 @@ static void prestera_port_destroy(struct prestera_port *port)
327338
struct net_device *dev = port->dev;
328339

329340
cancel_delayed_work_sync(&port->cached_hw_stats.caching_dw);
341+
prestera_devlink_port_clear(port);
330342
unregister_netdev(dev);
331343
prestera_port_list_del(port);
344+
prestera_devlink_port_unregister(port);
332345
free_netdev(dev);
333346
}
334347

@@ -446,13 +459,19 @@ static int prestera_switch_init(struct prestera_switch *sw)
446459
if (err)
447460
goto err_handlers_register;
448461

462+
err = prestera_devlink_register(sw);
463+
if (err)
464+
goto err_dl_register;
465+
449466
err = prestera_create_ports(sw);
450467
if (err)
451468
goto err_ports_create;
452469

453470
return 0;
454471

455472
err_ports_create:
473+
prestera_devlink_unregister(sw);
474+
err_dl_register:
456475
prestera_event_handlers_unregister(sw);
457476
err_handlers_register:
458477
prestera_rxtx_switch_fini(sw);
@@ -464,6 +483,7 @@ static int prestera_switch_init(struct prestera_switch *sw)
464483
static void prestera_switch_fini(struct prestera_switch *sw)
465484
{
466485
prestera_destroy_ports(sw);
486+
prestera_devlink_unregister(sw);
467487
prestera_event_handlers_unregister(sw);
468488
prestera_rxtx_switch_fini(sw);
469489
prestera_hw_switch_fini(sw);
@@ -474,7 +494,7 @@ int prestera_device_register(struct prestera_device *dev)
474494
struct prestera_switch *sw;
475495
int err;
476496

477-
sw = kzalloc(sizeof(*sw), GFP_KERNEL);
497+
sw = prestera_devlink_alloc();
478498
if (!sw)
479499
return -ENOMEM;
480500

@@ -483,7 +503,7 @@ int prestera_device_register(struct prestera_device *dev)
483503

484504
err = prestera_switch_init(sw);
485505
if (err) {
486-
kfree(sw);
506+
prestera_devlink_free(sw);
487507
return err;
488508
}
489509

@@ -496,7 +516,7 @@ void prestera_device_unregister(struct prestera_device *dev)
496516
struct prestera_switch *sw = dev->priv;
497517

498518
prestera_switch_fini(sw);
499-
kfree(sw);
519+
prestera_devlink_free(sw);
500520
}
501521
EXPORT_SYMBOL(prestera_device_unregister);
502522

0 commit comments

Comments
 (0)