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

Merge mlx5-next patches needed for upcoming mlx5 software steering.

1) Alex adds HW bits and definitions required for SW steering
2) Ariel moves device memory management to mlx5_core (From mlx5_ib)
3) Maor, Cleanups and fixups for eswitch mode and RoCE
4) Mark, Set only stag for match untagged packets

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

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index dee1a86,c1679d1..9648c22
--- 1/drivers/net/ethernet/mellanox/mlx5/core/main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -876,8 -879,11 +876,12 @@@ static int mlx5_init_once(struct mlx5_c
                goto err_eswitch_cleanup;
        }
  
+       dev->dm = mlx5_dm_create(dev);
+       if (IS_ERR(dev->dm))
+               mlx5_core_warn(dev, "Failed to init device memory%d\n", err);
+ 
        dev->tracer = mlx5_fw_tracer_create(dev);
 +      dev->hv_vhca = mlx5_hv_vhca_create(dev);
  
        return 0;
  
@@@ -908,8 -915,8 +912,9 @@@ err_devcom
  
  static void mlx5_cleanup_once(struct mlx5_core_dev *dev)
  {
 +      mlx5_hv_vhca_destroy(dev->hv_vhca);
        mlx5_fw_tracer_destroy(dev->tracer);
+       mlx5_dm_cleanup(dev);
        mlx5_fpga_cleanup(dev);
        mlx5_eswitch_cleanup(dev->priv.eswitch);
        mlx5_sriov_cleanup(dev);

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

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/driver.h
index 52a56d7,72bc6ce..3e80f03
--- 1/include/linux/mlx5/driver.h
--- 2/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -660,8 -662,10 +666,11 @@@ struct mlx5_dm
  struct mlx5_fw_tracer;
  struct mlx5_vxlan;
  struct mlx5_geneve;
 +struct mlx5_hv_vhca;
  
+ #define MLX5_LOG_SW_ICM_BLOCK_SIZE(dev) (MLX5_CAP_DEV_MEM(dev, log_sw_icm_alloc_granularity))
+ #define MLX5_SW_ICM_BLOCK_SIZE(dev) (1 << MLX5_LOG_SW_ICM_BLOCK_SIZE(dev))
+ 
  struct mlx5_core_dev {
        struct device *device;
        enum mlx5_coredev_type coredev_type;

diff --cc include/linux/mlx5/eswitch.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge