Commit 34dd1710 authored by Vadym Kochan's avatar Vadym Kochan Committed by David S. Miller
Browse files

net: marvell: prestera: Add basic devlink support 



Add very basic support for devlink interface:

    - driver name
    - fw version
    - devlink ports

Signed-off-by: default avatarVadym Kochan <vadym.kochan@plvision.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c2703df

drivers/net/ethernet/marvell/prestera/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
config PRESTERA

	tristate "Marvell Prestera Switch ASICs support"

	depends on NET_SWITCHDEV && VLAN_8021Q

	select NET_DEVLINK

	help

	  This driver supports Marvell Prestera Switch ASICs family.

drivers/net/ethernet/marvell/prestera/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_PRESTERA)	+= prestera.o

prestera-objs		:= prestera_main.o prestera_hw.o prestera_dsa.o \

			   prestera_rxtx.o

			   prestera_rxtx.o prestera_devlink.o



obj-$(CONFIG_PRESTERA_PCI)	+= prestera_pci.o

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

+4 −0
Original line number Diff line number Diff line
@@ -7,8 +7,11 @@ 
#include <linux/notifier.h>

#include <linux/skbuff.h>

#include <linux/workqueue.h>

#include <net/devlink.h>

#include <uapi/linux/if_ether.h>



#define PRESTERA_DRV_NAME	"prestera"



struct prestera_fw_rev {

	u16 maj;

	u16 min;
@@ -58,6 +61,7 @@ struct prestera_port_caps { 
struct prestera_port {

	struct net_device *dev;

	struct prestera_switch *sw;

	struct devlink_port dl_port;

	u32 id;

	u32 hw_id;

	u32 dev_id;

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

0 → 100644
+112 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0

/* Copyright (c) 2019-2020 Marvell International Ltd. All rights reserved */



#include <net/devlink.h>



#include "prestera_devlink.h"



static int prestera_dl_info_get(struct devlink *dl,

				struct devlink_info_req *req,

				struct netlink_ext_ack *extack)

{

	struct prestera_switch *sw = devlink_priv(dl);

	char buf[16];

	int err;



	err = devlink_info_driver_name_put(req, PRESTERA_DRV_NAME);

	if (err)

		return err;



	snprintf(buf, sizeof(buf), "%d.%d.%d",

		 sw->dev->fw_rev.maj,

		 sw->dev->fw_rev.min,

		 sw->dev->fw_rev.sub);



	return devlink_info_version_running_put(req,

					       DEVLINK_INFO_VERSION_GENERIC_FW,

					       buf);

}



static const struct devlink_ops prestera_dl_ops = {

	.info_get = prestera_dl_info_get,

};



struct prestera_switch *prestera_devlink_alloc(void)

{

	struct devlink *dl;



	dl = devlink_alloc(&prestera_dl_ops, sizeof(struct prestera_switch));



	return devlink_priv(dl);

}



void prestera_devlink_free(struct prestera_switch *sw)

{

	struct devlink *dl = priv_to_devlink(sw);



	devlink_free(dl);

}



int prestera_devlink_register(struct prestera_switch *sw)

{

	struct devlink *dl = priv_to_devlink(sw);

	int err;



	err = devlink_register(dl, sw->dev->dev);

	if (err)

		dev_err(prestera_dev(sw), "devlink_register failed: %d\n", err);



	return err;

}



void prestera_devlink_unregister(struct prestera_switch *sw)

{

	struct devlink *dl = priv_to_devlink(sw);



	devlink_unregister(dl);

}



int prestera_devlink_port_register(struct prestera_port *port)

{

	struct prestera_switch *sw = port->sw;

	struct devlink *dl = priv_to_devlink(sw);

	struct devlink_port_attrs attrs = {};

	int err;



	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

	attrs.phys.port_number = port->fp_id;

	attrs.switch_id.id_len = sizeof(sw->id);

	memcpy(attrs.switch_id.id, &sw->id, attrs.switch_id.id_len);



	devlink_port_attrs_set(&port->dl_port, &attrs);



	err = devlink_port_register(dl, &port->dl_port, port->fp_id);

	if (err) {

		dev_err(prestera_dev(sw), "devlink_port_register failed: %d\n", err);

		return err;

	}



	return 0;

}



void prestera_devlink_port_unregister(struct prestera_port *port)

{

	devlink_port_unregister(&port->dl_port);

}



void prestera_devlink_port_set(struct prestera_port *port)

{

	devlink_port_type_eth_set(&port->dl_port, port->dev);

}



void prestera_devlink_port_clear(struct prestera_port *port)

{

	devlink_port_type_clear(&port->dl_port);

}



struct devlink_port *prestera_devlink_get_port(struct net_device *dev)

{

	struct prestera_port *port = netdev_priv(dev);



	return &port->dl_port;

}

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */

/* Copyright (c) 2019-2020 Marvell International Ltd. All rights reserved. */



#ifndef _PRESTERA_DEVLINK_H_

#define _PRESTERA_DEVLINK_H_



#include "prestera.h"



struct prestera_switch *prestera_devlink_alloc(void);

void prestera_devlink_free(struct prestera_switch *sw);



int prestera_devlink_register(struct prestera_switch *sw);

void prestera_devlink_unregister(struct prestera_switch *sw);



int prestera_devlink_port_register(struct prestera_port *port);

void prestera_devlink_port_unregister(struct prestera_port *port);



void prestera_devlink_port_set(struct prestera_port *port);

void prestera_devlink_port_clear(struct prestera_port *port);



struct devlink_port *prestera_devlink_get_port(struct net_device *dev);



#endif /* _PRESTERA_DEVLINK_H_ */