Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d974d0 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: Handle host PF vport mac/guid for ECPF 



When ECPF is eswitch manager, it has the privilege to query and
configure the mac and node guid of host PF.

While vport number of host PF is 0, the vport command should be
issued with other_vport set in this case as the cmd is issued by
ECPF vport(0xfffe).

Add a specific function to query own vport mac. Low level functions
are used by vport manager to query/modify any vport mac and node guid.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 5f5d2536

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

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static void mlx5e_dcbnl_getpermhwaddr(struct net_device *netdev, 


	memset(perm_addr, 0xff, MAX_ADDR_LEN);



	mlx5_query_nic_vport_mac_address(priv->mdev, 0, perm_addr);

	mlx5_query_mac_address(priv->mdev, perm_addr);

}



static void mlx5e_dcbnl_setpgtccfgtx(struct net_device *netdev,

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

+1 −1
Original line number Diff line number Diff line
@@ -4581,7 +4581,7 @@ static void mlx5e_set_netdev_dev_addr(struct net_device *netdev) 
{

	struct mlx5e_priv *priv = netdev_priv(netdev);



	mlx5_query_nic_vport_mac_address(priv->mdev, 0, netdev->dev_addr);

	mlx5_query_mac_address(priv->mdev, netdev->dev_addr);

	if (is_zero_ether_addr(netdev->dev_addr) &&

	    !MLX5_CAP_GEN(priv->mdev, vport_group_manager)) {

		eth_hw_addr_random(netdev);

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

+1 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev) 
		SET_NETDEV_DEV(netdev, mdev->device);

		netdev->netdev_ops = &mlx5e_netdev_ops_uplink_rep;

		/* we want a persistent mac for the uplink rep */

		mlx5_query_nic_vport_mac_address(mdev, 0, netdev->dev_addr);

		mlx5_query_mac_address(mdev, netdev->dev_addr);

		netdev->ethtool_ops = &mlx5e_uplink_rep_ethtool_ops;

#ifdef CONFIG_MLX5_CORE_EN_DCB

		if (MLX5_CAP_GEN(mdev, qos))

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

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static void esw_vport_change_handle_locked(struct mlx5_vport *vport) 
	struct mlx5_eswitch *esw = dev->priv.eswitch;

	u8 mac[ETH_ALEN];



	mlx5_query_nic_vport_mac_address(dev, vport->vport, mac);

	mlx5_query_nic_vport_mac_address(dev, vport->vport, true, mac);

	esw_debug(dev, "vport[%d] Context Changed: perm mac: %pM\n",

		  vport->vport, mac);

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

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ int esw_offloads_init_reps(struct mlx5_eswitch *esw) 
	if (!esw->offloads.vport_reps)

		return -ENOMEM;



	mlx5_query_nic_vport_mac_address(dev, 0, hw_id);

	mlx5_query_mac_address(dev, hw_id);



	mlx5_esw_for_all_reps(esw, vport_index, rep) {

		rep->vport = mlx5_eswitch_index_to_vport_num(esw, vport_index);