Commit c6acd629 authored by Vladyslav Tarasiuk's avatar Vladyslav Tarasiuk Committed by Saeed Mahameed
Browse files

net/mlx5e: Add support for devlink-port in non-representors mode 



Added devlink_port field to mlx5e_priv structure and a callback to
netdev ops to enable devlink to get info about the port. The port
registration happens at driver initialization.

Signed-off-by: default avatarVladyslav Tarasiuk <vladyslavt@mellanox.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent ab8f963a

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \ 
		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_selftest.o en/port.o en/monitor_stats.o en/health.o \

		en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/umem.o \

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o



#

# Netdev extra

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ struct mlx5e_priv { 
#endif

	struct devlink_health_reporter *tx_reporter;

	struct devlink_health_reporter *rx_reporter;

	struct devlink_port             dl_phy_port;

	struct mlx5e_xsk           xsk;

#if IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)

	struct mlx5e_hv_vhca_stats_agent stats_agent;

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

0 → 100644
+38 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2020, Mellanox Technologies inc.  All rights reserved. */



#include "en/devlink.h"



int mlx5e_devlink_phy_port_register(struct net_device *dev)

{

	struct mlx5e_priv *priv;

	struct devlink *devlink;

	int err;



	priv = netdev_priv(dev);

	devlink = priv_to_devlink(priv->mdev);



	devlink_port_attrs_set(&priv->dl_phy_port,

			       DEVLINK_PORT_FLAVOUR_PHYSICAL,

			       PCI_FUNC(priv->mdev->pdev->devfn),

			       false, 0,

			       NULL, 0);

	err = devlink_port_register(devlink, &priv->dl_phy_port, 1);

	if (err)

		return err;

	devlink_port_type_eth_set(&priv->dl_phy_port, dev);

	return 0;

}



void mlx5e_devlink_phy_port_unregister(struct mlx5e_priv *priv)

{

	devlink_port_unregister(&priv->dl_phy_port);

}



struct devlink_port *mlx5e_get_devlink_phy_port(struct net_device *dev)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return &priv->dl_phy_port;

}

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/* Copyright (c) 2020, Mellanox Technologies inc.  All rights reserved. */



#ifndef __MLX5E_EN_DEVLINK_H

#define __MLX5E_EN_DEVLINK_H



#include <net/devlink.h>

#include "en.h"



int mlx5e_devlink_phy_port_register(struct net_device *dev);

void mlx5e_devlink_phy_port_unregister(struct mlx5e_priv *priv);

struct devlink_port *mlx5e_get_devlink_phy_port(struct net_device *dev);



#endif

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+11 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "en/xsk/rx.h"

#include "en/xsk/tx.h"

#include "en/hv_vhca_stats.h"

#include "en/devlink.h"

#include "lib/mlx5.h"
@@ -4605,6 +4606,7 @@ const struct net_device_ops mlx5e_netdev_ops = { 
	.ndo_set_vf_link_state   = mlx5e_set_vf_link_state,

	.ndo_get_vf_stats        = mlx5e_get_vf_stats,

#endif

	.ndo_get_devlink_port    = mlx5e_get_devlink_phy_port,

};



static int mlx5e_check_required_hca_cap(struct mlx5_core_dev *mdev)
@@ -5472,11 +5474,19 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
		goto err_detach;

	}



	err = mlx5e_devlink_phy_port_register(netdev);

	if (err) {

		mlx5_core_err(mdev, "mlx5e_devlink_phy_port_register failed, %d\n", err);

		goto err_unregister_netdev;

	}



#ifdef CONFIG_MLX5_CORE_EN_DCB

	mlx5e_dcbnl_init_app(priv);

#endif

	return priv;



err_unregister_netdev:

	unregister_netdev(netdev);

err_detach:

	mlx5e_detach(mdev, priv);

err_destroy_netdev:
@@ -5498,6 +5508,7 @@ static void mlx5e_remove(struct mlx5_core_dev *mdev, void *vpriv) 
#ifdef CONFIG_MLX5_CORE_EN_DCB

	mlx5e_dcbnl_delete_app(priv);

#endif

	mlx5e_devlink_phy_port_unregister(priv);

	unregister_netdev(priv->netdev);

	mlx5e_detach(mdev, vpriv);

	mlx5e_destroy_netdev(priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE