X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_mac.c;h=a791fedc9108abeae622c6659bc7d089d632e075;hb=89a4bcb1fc7cacc76349013217d496711241e0f3;hp=7bdaa2a392abe37b34eae8975b1f48d7c8237af2;hpb=0d1d73170820aa2248d467628ef39f813c5189bb;p=dpdk.git

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 7bdaa2a392..a791fedc91 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -4,57 +4,19 @@
  */
 
 #include <stddef.h>
-#include <assert.h>
 #include <stdint.h>
 #include <string.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-
-/* Verbs header. */
-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/verbs.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
+#include "mlx5_defs.h"
 #include "mlx5.h"
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
-#include "mlx5_defs.h"
-
-/**
- * Get MAC address by querying netdevice.
- *
- * @param[in] dev
- *   Pointer to Ethernet device.
- * @param[out] mac
- *   MAC address output buffer.
- *
- * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
- */
-int
-mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])
-{
-	struct ifreq request;
-	int ret;
-
-	ret = mlx5_ifreq(dev, SIOCGIFHWADDR, &request);
-	if (ret)
-		return ret;
-	memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
-	return 0;
-}
 
 /**
  * Remove a MAC address from the internal array.
@@ -67,15 +29,10 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])
 static void
 mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 {
-	struct mlx5_priv *priv = dev->data->dev_private;
-	const int vf = priv->config.vf;
-
-	assert(index < MLX5_MAX_MAC_ADDRESSES);
+	MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES);
 	if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
 		return;
-	if (vf)
-		mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index],
-					index);
+	mlx5_os_mac_addr_remove(dev, index);
 	memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
 }
 
@@ -96,11 +53,10 @@ static int
 mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
 			   uint32_t index)
 {
-	struct mlx5_priv *priv = dev->data->dev_private;
-	const int vf = priv->config.vf;
 	unsigned int i;
+	int ret;
 
-	assert(index < MLX5_MAX_MAC_ADDRESSES);
+	MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES);
 	if (rte_is_zero_ether_addr(mac)) {
 		rte_errno = EINVAL;
 		return -rte_errno;
@@ -116,12 +72,10 @@ mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
 		rte_errno = EADDRINUSE;
 		return -rte_errno;
 	}
-	if (vf) {
-		int ret = mlx5_nl_mac_addr_add(dev, mac, index);
+	ret = mlx5_os_mac_addr_add(dev, mac, index);
+	if (ret)
+		return ret;
 
-		if (ret)
-			return ret;
-	}
 	dev->data->mac_addrs[index] = *mac;
 	return 0;
 }
@@ -199,19 +153,30 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
 	uint16_t port_id;
 	struct mlx5_priv *priv = dev->data->dev_private;
+	struct mlx5_priv *pf_priv;
 
-	/* Configuring the VF instead of its representor. */
-	if (priv->representor) {
+	/*
+	 * Configuring the VF instead of its representor,
+	 * need to skip the special case of HPF on Bluefield.
+	 */
+	if (priv->representor && !mlx5_is_hpf(dev) && !mlx5_is_sf_repr(dev)) {
 		DRV_LOG(DEBUG, "VF represented by port %u setting primary MAC address",
 			dev->data->port_id);
+		if (priv->pf_bond >= 0) {
+			/* Bonding, get owner PF ifindex from shared data. */
+			return mlx5_os_vf_mac_addr_modify
+			       (priv,
+				priv->sh->bond.ports[priv->pf_bond].ifindex,
+				mac_addr,
+				MLX5_REPRESENTOR_REPR(priv->representor_id));
+		}
 		RTE_ETH_FOREACH_DEV_SIBLING(port_id, dev->data->port_id) {
-			priv = rte_eth_devices[port_id].data->dev_private;
-			if (priv->master == 1) {
-				priv = dev->data->dev_private;
-				return mlx5_nl_vf_mac_addr_modify
-					(&rte_eth_devices[port_id],
-					 mac_addr, priv->representor_id);
-			}
+			pf_priv = rte_eth_devices[port_id].data->dev_private;
+			if (pf_priv->master == 1)
+				return mlx5_os_vf_mac_addr_modify
+				       (priv, pf_priv->if_index, mac_addr,
+					MLX5_REPRESENTOR_REPR
+						(priv->representor_id));
 		}
 		rte_errno = -ENOTSUP;
 		return rte_errno;