Commit 8f7ba3ca authored by Rony Efraim's avatar Rony Efraim Committed by David S. Miller
Browse files

net/mlx4: Add set VF mac address support 



Add ndo_set_vf_mac support which allows to set the MAC address
for mlx4 VF Ethernet NICs from the host.

Signed-off-by: default avatarRony Efraim <ronye@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0eb62b93

drivers/net/ethernet/mellanox/mlx4/cmd.c

+31 −0
Original line number Diff line number Diff line
@@ -2016,3 +2016,34 @@ u32 mlx4_comm_get_version(void) 
{

	 return ((u32) CMD_CHAN_IF_REV << 8) | (u32) CMD_CHAN_VER;

}



static int mlx4_get_slave_indx(struct mlx4_dev *dev, int vf)

{

	if ((vf < 0) || (vf >= dev->num_vfs)) {

		mlx4_err(dev, "Bad vf number:%d (number of activated vf: %d)\n", vf, dev->num_vfs);

		return -EINVAL;

	}



	return vf+1;

}



int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_vport_state *s_info;

	int slave;



	if (!mlx4_is_master(dev))

		return -EPROTONOSUPPORT;



	slave = mlx4_get_slave_indx(dev, vf);

	if (slave < 0)

		return -EINVAL;



	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];

	s_info->mac = mac;

	mlx4_info(dev, "default mac on vf %d port %d to %llX will take afect only after vf restart\n",

		  vf, port, s_info->mac);

	return 0;

}

EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+41 −1
Original line number Diff line number Diff line
@@ -2024,6 +2024,19 @@ static int mlx4_en_set_features(struct net_device *netdev, 


}



static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac)

{

	struct mlx4_en_priv *en_priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = en_priv->mdev;

	u64 mac_u64 = mlx4_en_mac_to_u64(mac);



	if (!is_valid_ether_addr(mac))

		return -EINVAL;



	return mlx4_set_vf_mac(mdev->dev, en_priv->port, queue, mac_u64);

}





static const struct net_device_ops mlx4_netdev_ops = {

	.ndo_open		= mlx4_en_open,

	.ndo_stop		= mlx4_en_close,
@@ -2048,6 +2061,30 @@ static const struct net_device_ops mlx4_netdev_ops = { 
#endif

};



static const struct net_device_ops mlx4_netdev_ops_master = {

	.ndo_open		= mlx4_en_open,

	.ndo_stop		= mlx4_en_close,

	.ndo_start_xmit		= mlx4_en_xmit,

	.ndo_select_queue	= mlx4_en_select_queue,

	.ndo_get_stats		= mlx4_en_get_stats,

	.ndo_set_rx_mode	= mlx4_en_set_rx_mode,

	.ndo_set_mac_address	= mlx4_en_set_mac,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= mlx4_en_change_mtu,

	.ndo_tx_timeout		= mlx4_en_tx_timeout,

	.ndo_vlan_rx_add_vid	= mlx4_en_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= mlx4_en_vlan_rx_kill_vid,

	.ndo_set_vf_mac		= mlx4_en_set_vf_mac,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= mlx4_en_netpoll,

#endif

	.ndo_set_features	= mlx4_en_set_features,

	.ndo_setup_tc		= mlx4_en_setup_tc,

#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer	= mlx4_en_filter_rfs,

#endif

};



int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,

			struct mlx4_en_port_profile *prof)

{
@@ -2164,6 +2201,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
	/*

	 * Initialize netdev entry points

	 */

	if (mlx4_is_master(priv->mdev->dev))

		dev->netdev_ops = &mlx4_netdev_ops_master;

	else

		dev->netdev_ops = &mlx4_netdev_ops;

	dev->watchdog_timeo = MLX4_EN_WATCHDOG_TIMEOUT;

	netif_set_real_num_tx_queues(dev, priv->tx_ring_num);

include/linux/mlx4/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev); 
void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox);



u32 mlx4_comm_get_version(void);

int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);



#define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)