common/mlx5: introduce common library

[dpdk.git] / drivers / net / mlx5 / mlx5_mac.c

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 12ee37f..a646b90 100644 (file)
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -27,10 +27,10 @@
 #include <rte_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.
@@ -44,15 +44,15 @@
  *   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)[ETHER_ADDR_LEN])
+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, 0);
+       ret = mlx5_ifreq(dev, SIOCGIFHWADDR, &request);
        if (ret)
                return ret;
-       memcpy(mac, request.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+       memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
        return 0;
 }
 
@@ -67,16 +67,16 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN])
 static void
 mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        const int vf = priv->config.vf;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
-       if (is_zero_ether_addr(&dev->data->mac_addrs[index]))
+       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);
-       memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
+       memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
 }
 
 /**
@@ -93,15 +93,15 @@ mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
+mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
                           uint32_t index)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        const int vf = priv->config.vf;
        unsigned int i;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
-       if (is_zero_ether_addr(mac)) {
+       if (rte_is_zero_ether_addr(mac)) {
                rte_errno = EINVAL;
                return -rte_errno;
        }
@@ -166,7 +166,7 @@ mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
-mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
+mlx5_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
                  uint32_t index, uint32_t vmdq __rte_unused)
 {
        int ret;
@@ -195,8 +195,28 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
-mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+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;
+
+       /* Configuring the VF instead of its representor. */
+       if (priv->representor) {
+               DRV_LOG(DEBUG, "VF represented by port %u setting primary MAC address",
+                       dev->data->port_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);
+                       }
+               }
+               rte_errno = -ENOTSUP;
+               return rte_errno;
+       }
+
        DRV_LOG(DEBUG, "port %u setting primary MAC address",
                dev->data->port_id);
        return mlx5_mac_addr_add(dev, mac_addr, 0, 0);
@@ -209,7 +229,7 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
  */
 int
 mlx5_set_mc_addr_list(struct rte_eth_dev *dev,
-                     struct ether_addr *mc_addr_set, uint32_t nb_mc_addr)
+                     struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr)
 {
        uint32_t i;
        int ret;