X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_mac.c;h=bd786fd63874db61460e10662cb2af8c8dedc86e;hb=c902e264f67e92437ffdb30ef3c3f3aa6ed7a3d5;hp=e9334ea4ae17576d55b50ce603cd9e19588bc034;hpb=18c01b98b554fd5bab26e519aaacbd1e94465931;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index e9334ea4ae..bd786fd638 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -4,57 +4,20 @@ */ #include -#include #include #include #include #include #include -#include -#include - -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif #include #include #include +#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)[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, ETHER_ADDR_LEN); - return 0; -} /** * Remove a MAC address from the internal array. @@ -67,16 +30,11 @@ 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; - const int vf = priv->config.vf; - - assert(index < MLX5_MAX_MAC_ADDRESSES); - if (is_zero_ether_addr(&dev->data->mac_addrs[index])) + 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); - memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr)); + mlx5_os_mac_addr_remove(dev, index); + memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr)); } /** @@ -93,15 +51,14 @@ 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; - const int vf = priv->config.vf; unsigned int i; + int ret; - assert(index < MLX5_MAX_MAC_ADDRESSES); - if (is_zero_ether_addr(mac)) { + MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES); + if (rte_is_zero_ether_addr(mac)) { rte_errno = EINVAL; return -rte_errno; } @@ -116,12 +73,10 @@ mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct 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; } @@ -166,7 +121,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,9 +150,62 @@ 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, + * 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_os_vf_mac_addr_modify + (priv, + mlx5_ifindex(&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); } + +/** + * DPDK callback to set multicast addresses list. + * + * @see rte_eth_dev_set_mc_addr_list() + */ +int +mlx5_set_mc_addr_list(struct rte_eth_dev *dev, + struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr) +{ + uint32_t i; + int ret; + + if (nb_mc_addr >= MLX5_MAX_MC_MAC_ADDRESSES) { + rte_errno = ENOSPC; + return -rte_errno; + } + for (i = MLX5_MAX_UC_MAC_ADDRESSES; i != MLX5_MAX_MAC_ADDRESSES; ++i) + mlx5_internal_mac_addr_remove(dev, i); + i = MLX5_MAX_UC_MAC_ADDRESSES; + while (nb_mc_addr--) { + ret = mlx5_internal_mac_addr_add(dev, mc_addr_set++, i++); + if (ret) + return ret; + } + if (!dev->data->promiscuous) + return mlx5_traffic_restart(dev); + return 0; +}