mlx4: Avoid resetting MLX4_INTFF_BONDING per driver

The mlx4_core driver has a logic that allows a sub-driver to set the
MLX4_INTFF_BONDING flag which then causes that function mlx4_do_bond()
asks the sub-driver to fully re-probe a device when its bonding
configuration changes.

Performing this operation is disallowed in mlx4_register_interface()
when it is detected that any mlx4 device is multifunction (SRIOV). The
code then resets MLX4_INTFF_BONDING in the driver flags.

Move this check directly into mlx4_do_bond(). It provides a better
separation as mlx4_core no longer directly modifies the sub-driver flags
and it will allow to get rid of explicitly keeping track of all mlx4
devices by the intf.c code when it is switched to an auxiliary bus.

Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Tested-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 8cbc1bc..d578f75 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -96,11 +96,6 @@ int mlx4_register_interface(struct mlx4_interface *intf)
 
        list_add_tail(&intf->list, &intf_list);
        list_for_each_entry(priv, &dev_list, dev_list) {
-               if (mlx4_is_mfunc(&priv->dev) && (intf->flags & MLX4_INTFF_BONDING)) {
-                       mlx4_dbg(&priv->dev,
-                                "SRIOV, disabling HA mode for intf proto %d\n", intf->protocol);
-                       intf->flags &= ~MLX4_INTFF_BONDING;
-               }
                mlx4_add_device(intf, priv);
        }
 
@@ -155,10 +150,18 @@ int mlx4_do_bond(struct mlx4_dev *dev, bool enable)
 
        spin_lock_irqsave(&priv->ctx_lock, flags);
        list_for_each_entry_safe(dev_ctx, temp_dev_ctx, &priv->ctx_list, list) {
-               if (dev_ctx->intf->flags & MLX4_INTFF_BONDING) {
-                       list_add_tail(&dev_ctx->bond_list, &bond_list);
-                       list_del(&dev_ctx->list);
+               if (!(dev_ctx->intf->flags & MLX4_INTFF_BONDING))
+                       continue;
+
+               if (mlx4_is_mfunc(dev)) {
+                       mlx4_dbg(dev,
+                                "SRIOV, disabled HA mode for intf proto %d\n",
+                                dev_ctx->intf->protocol);
+                       continue;
                }
+
+               list_add_tail(&dev_ctx->bond_list, &bond_list);
+               list_del(&dev_ctx->list);
        }
        spin_unlock_irqrestore(&priv->ctx_lock, flags);