Commit ccd672bc authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5e: Pass mdev to mlx5e_devlink_port_register() 



Instead of accessing priv->mdev, pass mdev pointer to
mlx5e_devlink_port_register() and access it directly.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 29a299cb

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

+8 −7
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ mlx5e_devlink_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_i 
}



int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,

				struct mlx5e_priv *priv)

				struct mlx5e_priv *priv,

				struct mlx5_core_dev *mdev)

{

	struct devlink *devlink = priv_to_devlink(mlx5e_dev);

	struct devlink_port_attrs attrs = {};
@@ -46,19 +47,19 @@ int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev, 
	struct devlink_port *dl_port;

	unsigned int dl_port_index;



	if (mlx5_core_is_pf(priv->mdev)) {

	if (mlx5_core_is_pf(mdev)) {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

		attrs.phys.port_number = mlx5_get_dev_index(priv->mdev);

		if (MLX5_ESWITCH_MANAGER(priv->mdev)) {

			mlx5e_devlink_get_port_parent_id(priv->mdev, &ppid);

		attrs.phys.port_number = mlx5_get_dev_index(mdev);

		if (MLX5_ESWITCH_MANAGER(mdev)) {

			mlx5e_devlink_get_port_parent_id(mdev, &ppid);

			memcpy(attrs.switch_id.id, ppid.id, ppid.id_len);

			attrs.switch_id.id_len = ppid.id_len;

		}

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev,

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(mdev,

								     MLX5_VPORT_UPLINK);

	} else {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev, 0);

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(mdev, 0);

	}



	dl_port = mlx5e_devlink_get_dl_port(priv);

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

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
struct mlx5e_dev *mlx5e_create_devlink(struct device *dev);

void mlx5e_destroy_devlink(struct mlx5e_dev *mlx5e_dev);

int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,

				struct mlx5e_priv *priv);

				struct mlx5e_priv *priv,

				struct mlx5_core_dev *mdev);

void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv);



static inline struct devlink_port *

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

+1 −1
Original line number Diff line number Diff line
@@ -5921,7 +5921,7 @@ static int mlx5e_probe(struct auxiliary_device *adev, 
	priv->dfs_root = debugfs_create_dir("nic",

					    mlx5_debugfs_get_dev_root(priv->mdev));



	err = mlx5e_devlink_port_register(mlx5e_dev, priv);

	err = mlx5e_devlink_port_register(mlx5e_dev, priv, mdev);

	if (err) {

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

		goto err_destroy_netdev;