net/mlx4_core: Use both physical ports to dispatch link state events to VF

Under HA mode, the link down event should be sent to VFs only if both
ports are down.

Signed-off-by: Moni Shoua <monis@mellanox.com>
Reviewed-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 603d1c3d3b2ea1a8a98de110f1e777f1d751e649..4696053165f8ca192d5e8ccb21971d175d267ca7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -151,6 +151,17 @@ void mlx4_gen_slave_eqe(struct work_struct *work)
              eqe = next_slave_event_eqe(slave_eq)) {
                slave = eqe->slave_id;
 
+               if (eqe->type == MLX4_EVENT_TYPE_PORT_CHANGE &&
+                   eqe->subtype == MLX4_PORT_CHANGE_SUBTYPE_DOWN &&
+                   mlx4_is_bonded(dev)) {
+                       struct mlx4_port_cap port_cap;
+
+                       if (!mlx4_QUERY_PORT(dev, 1, &port_cap) && port_cap.link_state)
+                               goto consume;
+
+                       if (!mlx4_QUERY_PORT(dev, 2, &port_cap) && port_cap.link_state)
+                               goto consume;
+               }
                /* All active slaves need to receive the event */
                if (slave == ALL_SLAVES) {
                        for (i = 0; i <= dev->persist->num_vfs; i++) {
@@ -174,6 +185,7 @@ void mlx4_gen_slave_eqe(struct work_struct *work)
                                mlx4_warn(dev, "Failed to generate event for slave %d\n",
                                          slave);
                }
+consume:
                ++slave_eq->cons;
        }
 }
@@ -594,7 +606,9 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                                        break;
                                for (i = 0; i < dev->persist->num_vfs + 1;
                                     i++) {
-                                       if (!test_bit(i, slaves_port.slaves))
+                                       int reported_port = mlx4_is_bonded(dev) ? 1 : mlx4_phys_to_slave_port(dev, i, port);
+
+                                       if (!test_bit(i, slaves_port.slaves) && !mlx4_is_bonded(dev))
                                                continue;
                                        if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH) {
                                                if (i == mlx4_master_func_num(dev))
@@ -606,7 +620,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                                                        eqe->event.port_change.port =
                                                                cpu_to_be32(
                                                                (be32_to_cpu(eqe->event.port_change.port) & 0xFFFFFFF)
-                                                               | (mlx4_phys_to_slave_port(dev, i, port) << 28));
+                                                               | (reported_port << 28));
                                                        mlx4_slave_event(dev, i, eqe);
                                                }
                                        } else {  /* IB port */
@@ -636,7 +650,9 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                                        for (i = 0;
                                             i < dev->persist->num_vfs + 1;
                                             i++) {
-                                               if (!test_bit(i, slaves_port.slaves))
+                                               int reported_port = mlx4_is_bonded(dev) ? 1 : mlx4_phys_to_slave_port(dev, i, port);
+
+                                               if (!test_bit(i, slaves_port.slaves) && !mlx4_is_bonded(dev))
                                                        continue;
                                                if (i == mlx4_master_func_num(dev))
                                                        continue;
@@ -645,7 +661,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                                                        eqe->event.port_change.port =
                                                                cpu_to_be32(
                                                                (be32_to_cpu(eqe->event.port_change.port) & 0xFFFFFFF)
-                                                               | (mlx4_phys_to_slave_port(dev, i, port) << 28));
+                                                               | (reported_port << 28));
                                                        mlx4_slave_event(dev, i, eqe);
                                                }
                                        }