Commit b9caebb2 authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe
Browse files

RDMA/usnic: Remove the query_pkey callback 

Now that the query_pkey() isn't mandatory by the RDMA core, this callback
can be removed from the usnic provider. The libfabric userspace never
touches the pkey.

Link: https://lore.kernel.org/r/20200820125346.111902-1-kamalheib1@gmail.com


Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 657360d6

drivers/infiniband/hw/usnic/usnic_ib_main.c

+0 −2
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static int usnic_port_immutable(struct ib_device *ibdev, u8 port_num, 
	if (err)

		return err;



	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;



	return 0;
@@ -355,7 +354,6 @@ static const struct ib_device_ops usnic_dev_ops = { 
	.modify_qp = usnic_ib_modify_qp,

	.query_device = usnic_ib_query_device,

	.query_gid = usnic_ib_query_gid,

	.query_pkey = usnic_ib_query_pkey,

	.query_port = usnic_ib_query_port,

	.query_qp = usnic_ib_query_qp,

	.reg_user_mr = usnic_ib_reg_mr,

drivers/infiniband/hw/usnic/usnic_ib_verbs.c

+0 −11
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port, 


	props->port_cap_flags = 0;

	props->gid_tbl_len = 1;

	props->pkey_tbl_len = 1;

	props->bad_pkey_cntr = 0;

	props->qkey_viol_cntr = 0;

	props->max_mtu = IB_MTU_4096;
@@ -437,16 +436,6 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index, 
	return 0;

}



int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,

				u16 *pkey)

{

	if (index > 0)

		return -EINVAL;



	*pkey = 0xffff;

	return 0;

}



int usnic_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)

{

	struct usnic_ib_pd *pd = to_upd(ibpd);

drivers/infiniband/hw/usnic/usnic_ib_verbs.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, 
				struct ib_qp_init_attr *qp_init_attr);

int usnic_ib_query_gid(struct ib_device *ibdev, u8 port, int index,

				union ib_gid *gid);

int usnic_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,

				u16 *pkey);

int usnic_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata);

void usnic_ib_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata);

struct ib_qp *usnic_ib_create_qp(struct ib_pd *pd,

CRA Git | Maintained and supported by SUSTech CRA and CCSE