net/mlx4: Set steering mode according to device capabilities

Instead of checking the firmware supported steering mode in various
places in the code, add a dedicated field in the mlx4 device capabilities
structure which is written once during the initialization flow and read
across the code.

This also set the grounds for add new steering modes. Currently two modes
are supported, and are named after the ConnectX HW versions A0 and B0.

A0 steering uses mac_index, vlan_index and priority to steer traffic
into pre-defined range of QPs.

B0 steering uses Ethernet L2 hashing rules and is enabled only
if the firmware supports both unicast and multicast B0 steering,

The current steering modes are relevant for Ethernet traffic only,
such that Infiniband steering remains untouched.

Signed-off-by: Hadar Hen Zion <hadarh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 72 insertions, 36 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index bedcbb30d38f..44ff7cdb15e5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -265,7 +265,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
         struct mlx4_en_mc_list *mclist, *tmp;
         u64 mcast_addr = 0;
         u8 mc_list[16] = {0};
-        int err;
+        int err = 0;
 
         mutex_lock(&mdev->state_lock);
         if (!mdev->device_up) {
@@ -300,16 +300,36 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         priv->flags |= MLX4_EN_FLAG_PROMISC;
 
                         /* Enable promiscouos mode */
-                        if (!(mdev->dev->caps.flags &
-                                                MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                                err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                                             priv->base_qpn, 1);
-                        else
-                                err = mlx4_unicast_promisc_add(mdev->dev, priv->base_qpn,
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_unicast_promisc_add(mdev->dev,
+                                                               priv->base_qpn,
                                                                priv->port);
-                        if (err)
-                                en_err(priv, "Failed enabling "
-                                             "promiscuous mode\n");
+                                if (err)
+                                        en_err(priv, "Failed enabling unicast promiscuous mode\n");
+
+                                /* Add the default qp number as multicast
+                                 * promisc
+                                 */
+                                if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+                                        err = mlx4_multicast_promisc_add(mdev->dev,
+                                                                         priv->base_qpn,
+                                                                         priv->port);
+                                        if (err)
+                                                en_err(priv, "Failed enabling multicast promiscuous mode\n");
+                                        priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+                                }
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+                                                             priv->port,
+                                                             priv->base_qpn,
+                                                             1);
+                                if (err)
+                                        en_err(priv, "Failed enabling promiscuous mode\n");
+                                break;
+                        }
 
                         /* Disable port multicast filter (unconditionally) */
                         err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
@@ -318,15 +338,6 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                 en_err(priv, "Failed disabling "
                                              "multicast filter\n");
 
-                        /* Add the default qp number as multicast promisc */
-                        if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
-                                err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
-                                                                 priv->port);
-                                if (err)
-                                        en_err(priv, "Failed entering multicast promisc mode\n");
-                                priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
-                        }
-
                         /* Disable port VLAN filter */
                         err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
                         if (err)
@@ -345,22 +356,31 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
                 /* Disable promiscouos mode */
-                if (!(mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                        err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                                     priv->base_qpn, 0);
-                else
-                        err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
+                switch (mdev->dev->caps.steering_mode) {
+                case MLX4_STEERING_MODE_B0:
+                        err = mlx4_unicast_promisc_remove(mdev->dev,
+                                                          priv->base_qpn,
                                                           priv->port);
-                if (err)
-                        en_err(priv, "Failed disabling promiscuous mode\n");
+                        if (err)
+                                en_err(priv, "Failed disabling unicast promiscuous mode\n");
+                        /* Disable Multicast promisc */
+                        if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+                                err = mlx4_multicast_promisc_remove(mdev->dev,
+                                                                    priv->base_qpn,
+                                                                    priv->port);
+                                if (err)
+                                        en_err(priv, "Failed disabling multicast promiscuous mode\n");
+                                priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                        }
+                        break;
 
-                /* Disable Multicast promisc */
-                if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
-                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
-                                                            priv->port);
+                case MLX4_STEERING_MODE_A0:
+                        err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+                                                     priv->port,
+                                                     priv->base_qpn, 0);
                         if (err)
-                                en_err(priv, "Failed disabling multicast promiscuous mode\n");
-                        priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                                en_err(priv, "Failed disabling promiscuous mode\n");
+                        break;
                 }
 
                 /* Enable port VLAN filter */
@@ -378,8 +398,16 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
 
                 /* Add the default qp number as multicast promisc */
                 if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
-                        err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
-                                                         priv->port);
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_multicast_promisc_add(mdev->dev,
+                                                                 priv->base_qpn,
+                                                                 priv->port);
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                break;
+                        }
                         if (err)
                                 en_err(priv, "Failed entering multicast promisc mode\n");
                         priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
@@ -387,8 +415,16 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
         } else {
                 /* Disable Multicast promisc */
                 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
-                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
-                                                            priv->port);
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_multicast_promisc_remove(mdev->dev,
+                                                                    priv->base_qpn,
+                                                                    priv->port);
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                break;
+                        }
                         if (err)
                                 en_err(priv, "Failed disabling multicast promiscuous mode\n");
                         priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;