Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e448834e authored by Shani Michaeli's avatar Shani Michaeli Committed by Roland Dreier
Browse files

mlx4_core: Enable memory windows in {INIT, QUERY}_HCA 



Add memory windows-related code to INIT_HCA and QUERY_HCA.

Signed-off-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarShani Michaeli <shanim@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent cc1ade94

drivers/net/ethernet/mellanox/mlx4/fw.c

+3 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
#define  INIT_HCA_FS_IB_NUM_ADDRS_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x26)

#define INIT_HCA_TPT_OFFSET		 0x0f0

#define	 INIT_HCA_DMPT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x00)

#define  INIT_HCA_TPT_MW_OFFSET		 (INIT_HCA_TPT_OFFSET + 0x08)

#define	 INIT_HCA_LOG_MPT_SZ_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x0b)

#define	 INIT_HCA_MTT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x10)

#define	 INIT_HCA_CMPT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x18)
@@ -1323,6 +1324,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
	/* TPT attributes */



	MLX4_PUT(inbox, param->dmpt_base,  INIT_HCA_DMPT_BASE_OFFSET);

	MLX4_PUT(inbox, param->mw_enabled, INIT_HCA_TPT_MW_OFFSET);

	MLX4_PUT(inbox, param->log_mpt_sz, INIT_HCA_LOG_MPT_SZ_OFFSET);

	MLX4_PUT(inbox, param->mtt_base,   INIT_HCA_MTT_BASE_OFFSET);

	MLX4_PUT(inbox, param->cmpt_base,  INIT_HCA_CMPT_BASE_OFFSET);
@@ -1419,6 +1421,7 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev, 
	/* TPT attributes */



	MLX4_GET(param->dmpt_base,  outbox, INIT_HCA_DMPT_BASE_OFFSET);

	MLX4_GET(param->mw_enabled, outbox, INIT_HCA_TPT_MW_OFFSET);

	MLX4_GET(param->log_mpt_sz, outbox, INIT_HCA_LOG_MPT_SZ_OFFSET);

	MLX4_GET(param->mtt_base,   outbox, INIT_HCA_MTT_BASE_OFFSET);

	MLX4_GET(param->cmpt_base,  outbox, INIT_HCA_CMPT_BASE_OFFSET);

drivers/net/ethernet/mellanox/mlx4/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct mlx4_init_hca_param { 
	u8  log_mc_table_sz;

	u8  log_mpt_sz;

	u8  log_uar_sz;

	u8  mw_enabled;  /* Enable memory windows */

	u8  uar_page_sz; /* log pg sz in 4k chunks */

	u8  fs_hash_enable_bits;

	u8  steering_mode; /* for QUERY_HCA */

drivers/net/ethernet/mellanox/mlx4/main.c

+4 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,10 @@ static int mlx4_init_hca(struct mlx4_dev *dev) 


		init_hca.log_uar_sz = ilog2(dev->caps.num_uars);

		init_hca.uar_page_sz = PAGE_SHIFT - 12;

		init_hca.mw_enabled = 0;

		if (dev->caps.flags & MLX4_DEV_CAP_FLAG_MEM_WINDOW ||

		    dev->caps.bmme_flags & MLX4_BMME_FLAG_TYPE_2_WIN)

			init_hca.mw_enabled = INIT_HCA_TPT_MW_ENABLE;



		err = mlx4_init_icm(dev, &dev_cap, &init_hca, icm_size);

		if (err)

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#define MLX4_FS_MGM_LOG_ENTRY_SIZE	7

#define MLX4_FS_NUM_MCG			(1 << 17)



#define INIT_HCA_TPT_MW_ENABLE          (1 << 7)



enum {

	MLX4_FS_L2_HASH = 0,

	MLX4_FS_L2_L3_L4_HASH,