Commit 91e7398e authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

net/mlx5: Update pfnum retrieval for devlink port attributes 



Align mlx5 driver usage of 'pfnum' with the documentation clarification
introduced in commit bb70b0d4 ("devlink: Improve the port attributes
description").

Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1742392983-153050-4-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ade4794f

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch * 
	u16 pfnum;



	mlx5_esw_get_port_parent_id(dev, &ppid);

	pfnum = mlx5_get_dev_index(dev);

	pfnum = PCI_FUNC(dev->pdev->devfn);

	external = mlx5_core_is_ecpf_esw_manager(dev);

	if (external)

		controller_num = dev->priv.eswitch->offloads.host_number + 1;
@@ -110,7 +110,7 @@ static void mlx5_esw_offloads_sf_devlink_port_attrs_set(struct mlx5_eswitch *esw 
	struct netdev_phys_item_id ppid = {};

	u16 pfnum;



	pfnum = mlx5_get_dev_index(dev);

	pfnum = PCI_FUNC(dev->pdev->devfn);

	mlx5_esw_get_port_parent_id(dev, &ppid);

	memcpy(dl_port->attrs.switch_id.id, &ppid.id[0], ppid.id_len);

	dl_port->attrs.switch_id.id_len = ppid.id_len;

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

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ mlx5_sf_new_check_attr(struct mlx5_core_dev *dev, const struct devlink_port_new_ 
		NL_SET_ERR_MSG_MOD(extack, "External controller is unsupported");

		return -EOPNOTSUPP;

	}

	if (new_attr->pfnum != mlx5_get_dev_index(dev)) {

	if (new_attr->pfnum != PCI_FUNC(dev->pdev->devfn)) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid pfnum supplied");

		return -EOPNOTSUPP;

	}