Commit 5e8fba84 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-const-dev_addr' 



Jakub Kicinski says:

====================
mlx4: prep for constant dev->dev_addr

This patch converts mlx4 for dev->dev_addr being const. It converts
to use of common helpers but also removes some seemingly unnecessary
idiosyncrasies.

Please review.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 549017aa ebb1fdb5

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2275,7 +2275,7 @@ static void mlx4_ib_update_qps(struct mlx4_ib_dev *ibdev, 
	u64 release_mac = MLX4_IB_INVALID_MAC;

	struct mlx4_ib_qp *qp;



	new_smac = mlx4_mac_to_u64(dev->dev_addr);

	new_smac = ether_addr_to_u64(dev->dev_addr);

	atomic64_set(&ibdev->iboe.mac[port - 1], new_smac);



	/* no need for update QP1 and mac registration in non-SRIOV */

drivers/infiniband/hw/mlx4/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -1853,7 +1853,7 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_qp_attr *qp, 
			 u16 vlan_id, u8 *smac)

{

	return _mlx4_set_path(dev, &qp->ah_attr,

			      mlx4_mac_to_u64(smac),

			      ether_addr_to_u64(smac),

			      vlan_id,

			      path, &mqp->pri, port);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3009,7 +3009,7 @@ int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u8 *mac) 
		return -EPERM;

	}



	s_info->mac = mlx4_mac_to_u64(mac);

	s_info->mac = ether_addr_to_u64(mac);

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

		  vf, port, s_info->mac);

	return 0;
@@ -3195,7 +3195,7 @@ int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting) 
	port = mlx4_slaves_closest_port(dev, slave, port);

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



	mlx4_u64_to_mac(mac, s_info->mac);

	u64_to_ether_addr(s_info->mac, mac);

	if (setting && !is_valid_ether_addr(mac)) {

		mlx4_info(dev, "Illegal MAC with spoofchk\n");

		return -EPERM;

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

+19 −19
Original line number Diff line number Diff line
@@ -527,18 +527,17 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, 
	return err;

}



static void mlx4_en_u64_to_mac(unsigned char dst_mac[ETH_ALEN + 2], u64 src_mac)

static void mlx4_en_u64_to_mac(struct net_device *dev, u64 src_mac)

{

	int i;

	for (i = ETH_ALEN - 1; i >= 0; --i) {

		dst_mac[i] = src_mac & 0xff;

		src_mac >>= 8;

	}

	memset(&dst_mac[ETH_ALEN], 0, 2);

	u8 addr[ETH_ALEN];



	u64_to_ether_addr(src_mac, addr);

	eth_hw_addr_set(dev, addr);

}





static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv, unsigned char *addr,

static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv,

				    const unsigned char *addr,

				    int qpn, u64 *reg_id)

{

	int err;
@@ -559,7 +558,7 @@ static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv, unsigned char *ad 




static int mlx4_en_uc_steer_add(struct mlx4_en_priv *priv,

				unsigned char *mac, int *qpn, u64 *reg_id)

				const unsigned char *mac, int *qpn, u64 *reg_id)

{

	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_dev *dev = mdev->dev;
@@ -611,7 +610,8 @@ static int mlx4_en_uc_steer_add(struct mlx4_en_priv *priv, 
}



static void mlx4_en_uc_steer_release(struct mlx4_en_priv *priv,

				     unsigned char *mac, int qpn, u64 reg_id)

				     const unsigned char *mac,

				     int qpn, u64 reg_id)

{

	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_dev *dev = mdev->dev;
@@ -644,7 +644,7 @@ static int mlx4_en_get_qp(struct mlx4_en_priv *priv) 
	int index = 0;

	int err = 0;

	int *qpn = &priv->base_qpn;

	u64 mac = mlx4_mac_to_u64(priv->dev->dev_addr);

	u64 mac = ether_addr_to_u64(priv->dev->dev_addr);



	en_dbg(DRV, priv, "Registering MAC: %pM for adding\n",

	       priv->dev->dev_addr);
@@ -683,7 +683,7 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv) 
	int qpn = priv->base_qpn;



	if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {

		u64 mac = mlx4_mac_to_u64(priv->dev->dev_addr);

		u64 mac = ether_addr_to_u64(priv->dev->dev_addr);

		en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",

		       priv->dev->dev_addr);

		mlx4_unregister_mac(dev, priv->port, mac);
@@ -701,14 +701,14 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, 
	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_dev *dev = mdev->dev;

	int err = 0;

	u64 new_mac_u64 = mlx4_mac_to_u64(new_mac);

	u64 new_mac_u64 = ether_addr_to_u64(new_mac);



	if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {

		struct hlist_head *bucket;

		unsigned int mac_hash;

		struct mlx4_mac_entry *entry;

		struct hlist_node *tmp;

		u64 prev_mac_u64 = mlx4_mac_to_u64(prev_mac);

		u64 prev_mac_u64 = ether_addr_to_u64(prev_mac);



		bucket = &priv->mac_hash[prev_mac[MLX4_EN_MAC_HASH_IDX]];

		hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
@@ -1076,7 +1076,7 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv *priv, 
		mlx4_en_cache_mclist(dev);

		netif_addr_unlock_bh(dev);

		list_for_each_entry(mclist, &priv->mc_list, list) {

			mcast_addr = mlx4_mac_to_u64(mclist->addr);

			mcast_addr = ether_addr_to_u64(mclist->addr);

			mlx4_SET_MCAST_FLTR(mdev->dev, priv->port,

					    mcast_addr, 0, MLX4_MCAST_CONFIG);

		}
@@ -1169,7 +1169,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv, 
				found = true;



			if (!found) {

				mac = mlx4_mac_to_u64(entry->mac);

				mac = ether_addr_to_u64(entry->mac);

				mlx4_en_uc_steer_release(priv, entry->mac,

							 priv->base_qpn,

							 entry->reg_id);
@@ -1212,7 +1212,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv, 
				priv->flags |= MLX4_EN_FLAG_FORCE_PROMISC;

				break;

			}

			mac = mlx4_mac_to_u64(ha->addr);

			mac = ether_addr_to_u64(ha->addr);

			memcpy(entry->mac, ha->addr, ETH_ALEN);

			err = mlx4_register_mac(mdev->dev, priv->port, mac);

			if (err < 0) {
@@ -1348,7 +1348,7 @@ static void mlx4_en_delete_rss_steer_rules(struct mlx4_en_priv *priv) 
	for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {

		bucket = &priv->mac_hash[i];

		hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {

			mac = mlx4_mac_to_u64(entry->mac);

			mac = ether_addr_to_u64(entry->mac);

			en_dbg(DRV, priv, "Registering MAC:%pM for deleting\n",

			       entry->mac);

			mlx4_en_uc_steer_release(priv, entry->mac,
@@ -3267,7 +3267,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 


	/* Set default MAC */

	dev->addr_len = ETH_ALEN;

	mlx4_en_u64_to_mac(dev->dev_addr, mdev->dev->caps.def_mac[priv->port]);

	mlx4_en_u64_to_mac(dev, mdev->dev->caps.def_mac[priv->port]);

	if (!is_valid_ether_addr(dev->dev_addr)) {

		en_err(priv, "Port: %d, invalid mac burned: %pM, quitting\n",

		       priv->port, dev->dev_addr);

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

+1 −1
Original line number Diff line number Diff line
@@ -3105,7 +3105,7 @@ void mlx4_replace_zero_macs(struct mlx4_dev *dev) 
		    dev->caps.port_type[i] == MLX4_PORT_TYPE_ETH) {

			eth_random_addr(mac_addr);

			dev->port_random_macs |= 1 << i;

			dev->caps.def_mac[i] = mlx4_mac_to_u64(mac_addr);

			dev->caps.def_mac[i] = ether_addr_to_u64(mac_addr);

		}

}

EXPORT_SYMBOL_GPL(mlx4_replace_zero_macs);