From: Saeed Mahameed <saeedm@mellanox.com>
Date: Mon, 2 Sep 2019 06:47:09 +0000 (-0700)
Subject: Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox... 
X-Git-Tag: microblaze-v5.5-rc1~160^2~91^2~18
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a06ebb8d953b4100236f3057be51d67640e06323;p=linux-2.6-microblaze.git

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

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>
---

a06ebb8d953b4100236f3057be51d67640e06323
diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index dee1a8658c87,c1679d11d71f..9648c2297803
--- a/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 include/linux/mlx5/driver.h
index 52a56d741f79,72bc6ce44b55..3e80f03a387f
--- a/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;