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

Commit cdbd0d2b authored by Ariel Levkovich's avatar Ariel Levkovich Committed by Jason Gunthorpe
Browse files

net/mlx5: Mkey creation command adjustments 



This change updates the mlx5 interface to create mkey
on the device.

The updates in the command mailbox include increasing the
access mode type field to 5 bits in order to support additional
types such as MLX5_MKC_ACCESS_MODE_MEMIC which represents device
memory access type and will be used when registering MR on allocated
device memory.

All the places that use the old access mode format are adjusted as
well.

Signed-off-by: default avatarAriel Levkovich <lariel@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 24da0016

drivers/infiniband/hw/mlx5/cmd.c

+7 −9
Original line number Diff line number Diff line
@@ -99,23 +99,21 @@ int mlx5_cmd_alloc_memic(struct mlx5_memic *memic, phys_addr_t *addr, 
	MLX5_SET(alloc_memic_in, in, log_memic_addr_alignment,

		 mlx5_alignment);



	do {

	while (page_idx < num_memic_hw_pages) {

		spin_lock(&memic->memic_lock);

		page_idx = bitmap_find_next_zero_area(memic->memic_alloc_pages,

						      num_memic_hw_pages,

						      page_idx,

						      num_pages, 0);



		if (page_idx + num_pages <= num_memic_hw_pages)

		if (page_idx < num_memic_hw_pages)

			bitmap_set(memic->memic_alloc_pages,

				   page_idx, num_pages);

		else

			ret = -ENOMEM;



		spin_unlock(&memic->memic_lock);



		if (ret)

			return ret;

		if (page_idx >= num_memic_hw_pages)

			break;



		MLX5_SET64(alloc_memic_in, in, range_start_addr,

			   hw_start_addr + (page_idx * PAGE_SIZE));
@@ -138,10 +136,10 @@ int mlx5_cmd_alloc_memic(struct mlx5_memic *memic, phys_addr_t *addr, 
		*addr = pci_resource_start(dev->pdev, 0) +

			MLX5_GET64(alloc_memic_out, out, memic_start_addr);



		return ret;

	} while (page_idx < num_memic_hw_pages);

		return 0;

	}



	return ret;

	return -ENOMEM;

}



int mlx5_cmd_dealloc_memic(struct mlx5_memic *memic, u64 addr, u64 length)

drivers/infiniband/hw/mlx5/mr.c

+8 −5
Original line number Diff line number Diff line
@@ -204,7 +204,9 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num) 


		MLX5_SET(mkc, mkc, free, 1);

		MLX5_SET(mkc, mkc, umr_en, 1);

		MLX5_SET(mkc, mkc, access_mode, ent->access_mode);

		MLX5_SET(mkc, mkc, access_mode_1_0, ent->access_mode & 0x3);

		MLX5_SET(mkc, mkc, access_mode_4_2,

			 (ent->access_mode >> 2) & 0x7);



		MLX5_SET(mkc, mkc, qpn, 0xffffff);

		MLX5_SET(mkc, mkc, translations_octword_size, ent->xlt);
@@ -804,7 +806,7 @@ struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc) 


	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);



	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC));

	MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE));

	MLX5_SET(mkc, mkc, rr, !!(acc & IB_ACCESS_REMOTE_READ));
@@ -1171,7 +1173,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_mr *ibmr, struct ib_pd *pd, 


	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);

	MLX5_SET(mkc, mkc, free, !populate);

	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_MTT);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_MTT);

	MLX5_SET(mkc, mkc, a, !!(access_flags & IB_ACCESS_REMOTE_ATOMIC));

	MLX5_SET(mkc, mkc, rw, !!(access_flags & IB_ACCESS_REMOTE_WRITE));

	MLX5_SET(mkc, mkc, rr, !!(access_flags & IB_ACCESS_REMOTE_READ));
@@ -1668,7 +1670,8 @@ struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, 
		goto err_free_in;

	}



	MLX5_SET(mkc, mkc, access_mode, mr->access_mode);

	MLX5_SET(mkc, mkc, access_mode_1_0, mr->access_mode & 0x3);

	MLX5_SET(mkc, mkc, access_mode_4_2, (mr->access_mode >> 2) & 0x7);

	MLX5_SET(mkc, mkc, umr_en, 1);



	mr->ibmr.device = pd->device;
@@ -1749,7 +1752,7 @@ struct ib_mw *mlx5_ib_alloc_mw(struct ib_pd *pd, enum ib_mw_type type, 
	MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn);

	MLX5_SET(mkc, mkc, umr_en, 1);

	MLX5_SET(mkc, mkc, lr, 1);

	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_KLMS);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_KLMS);

	MLX5_SET(mkc, mkc, en_rinval, !!((type == IB_MW_TYPE_2)));

	MLX5_SET(mkc, mkc, qpn, 0xffffff);

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, 
		return -ENOMEM;



	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);

	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, lw, 1);

	MLX5_SET(mkc, mkc, lr, 1);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int mlx5e_create_umr_mkey(struct mlx5_core_dev *mdev, 
	MLX5_SET(mkc, mkc, umr_en, 1);

	MLX5_SET(mkc, mkc, lw, 1);

	MLX5_SET(mkc, mkc, lr, 1);

	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_MTT);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_MTT);



	MLX5_SET(mkc, mkc, qpn, 0xffffff);

	MLX5_SET(mkc, mkc, pd, mdev->mlx5e_res.pdn);

drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int mlx5_fpga_conn_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, 
		return -ENOMEM;



	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);

	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_PA);

	MLX5_SET(mkc, mkc, lw, 1);

	MLX5_SET(mkc, mkc, lr, 1);