net/mlx5: fix VF MAC address set over BlueField

[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 291f772..88c52b2 100644 (file)
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -12,16 +12,6 @@
 #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 <rte_common.h>
@@ -31,30 +21,6 @@
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.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.
  *
@@ -66,16 +32,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;
-
        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(priv->nl_socket_route,
-                                       mlx5_ifindex(dev), priv->mac_own,
-                                       &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,9 +56,8 @@ 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;
 
        MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES);
        if (rte_is_zero_ether_addr(mac)) {
@@ -116,14 +75,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(priv->nl_socket_route,
-                                              mlx5_ifindex(dev), priv->mac_own,
-                                              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;
 }
@@ -202,16 +157,19 @@ 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) {
+       /*
+        * Configuring the VF instead of its representor,
+        * need to skip the special case of HPF on Bluefield.
+        */
+       if (priv->representor && priv->representor_id >= 0) {
                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
-                                      (priv->nl_socket_route,
+                               return mlx5_os_vf_mac_addr_modify
+                                      (priv,
                                        mlx5_ifindex(&rte_eth_devices[port_id]),
                                        mac_addr, priv->representor_id);
                        }