Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

Merge mlx5-next shared branched into net-next,

From Bodong Wang:
1) Introduction of ECPF (Embedded CPU Physical Function), and low level
bits for mlx5 SmartNic capabilities support.
2) Vport enumeration refactoring that affect mlx5_ib and mlx5_core

From Aya Levin,
3) Add support for 50Gbps per lane link modes in the Port Type and Speed
register (PTYS)
4) Refactor low level query functions for PTYS register
5) Add support for 50Gbps per lane link modes to mlx5_ib

Note: due to a change in API in mlx5/core and a later patch from net-next,
a fixup was squashed with this merge commit that replaces FDB_UPLINK_VPORT
with MLX5_VPORT_UPLINK which exists only in upstream net-next.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --cc drivers/net/ethernet/mellanox/mlx5/core/Makefile
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 7b5829406d95efbf00f1c912e5b3b2c5bc94624b,c78d21b2501eb855a5b16be1dc1b67e693b66a16..685f1975be58be6f7bee0ef18def27bf4a6516a4
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@@ -1113,17 -1122,9 +1113,17 @@@ static int mlx5e_rep_get_phys_port_name
        struct mlx5e_priv *priv = netdev_priv(dev);
        struct mlx5e_rep_priv *rpriv = priv->ppriv;
        struct mlx5_eswitch_rep *rep = rpriv->rep;
 -      int ret;
 +      int ret, pf_num;
 +
 +      ret = mlx5_lag_get_pf_num(priv->mdev, &pf_num);
 +      if (ret)
 +              return ret;
 +
-       if (rep->vport == FDB_UPLINK_VPORT)
++      if (rep->vport == MLX5_VPORT_UPLINK)
 +              ret = snprintf(buf, len, "p%d", pf_num);
 +      else
 +              ret = snprintf(buf, len, "pf%dvf%d", pf_num, rep->vport - 1);
  
 -      ret = snprintf(buf, len, "%d", rep->vport - 1);
        if (ret >= len)
                return -EOPNOTSUPP;
  

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Simple merge