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

Commit 0e1f9b92 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA/providers: Simplify query_gid callback of RoCE providers 



ib_query_gid() fetches the GID from the software cache maintained in
ib_core for RoCE ports.

Therefore, simplify the provider drivers for RoCE to treat query_gid()
callback as never called for RoCE, and only require non-RoCE devices to
implement it.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 72e1ff0f

drivers/infiniband/core/device.c

+3 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static int ib_device_check_mandatory(struct ib_device *device) 
		IB_MANDATORY_FUNC(query_device),

		IB_MANDATORY_FUNC(query_port),

		IB_MANDATORY_FUNC(query_pkey),

		IB_MANDATORY_FUNC(query_gid),

		IB_MANDATORY_FUNC(alloc_pd),

		IB_MANDATORY_FUNC(dealloc_pd),

		IB_MANDATORY_FUNC(create_ah),
@@ -884,6 +883,9 @@ int ib_query_gid(struct ib_device *device, 
	if (attr)

		return -EINVAL;



	if (!device->query_gid)

		return -EOPNOTSUPP;



	return device->query_gid(device, port_num, index, gid);

}

EXPORT_SYMBOL(ib_query_gid);

drivers/infiniband/hw/bnxt_re/main.c

+0 −1
Original line number Diff line number Diff line
@@ -574,7 +574,6 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 
	ibdev->get_port_immutable	= bnxt_re_get_port_immutable;

	ibdev->get_dev_fw_str           = bnxt_re_query_fw_str;

	ibdev->query_pkey		= bnxt_re_query_pkey;

	ibdev->query_gid		= bnxt_re_query_gid;

	ibdev->get_netdev		= bnxt_re_get_netdev;

	ibdev->add_gid			= bnxt_re_add_gid;

	ibdev->del_gid			= bnxt_re_del_gid;

drivers/infiniband/hw/hns/hns_roce_main.c

+0 −7
Original line number Diff line number Diff line
@@ -296,12 +296,6 @@ static enum rdma_link_layer hns_roce_get_link_layer(struct ib_device *device, 
	return IB_LINK_LAYER_ETHERNET;

}



static int hns_roce_query_gid(struct ib_device *ib_dev, u8 port_num, int index,

			      union ib_gid *gid)

{

	return 0;

}



static int hns_roce_query_pkey(struct ib_device *ib_dev, u8 port, u16 index,

			       u16 *pkey)

{
@@ -482,7 +476,6 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev) 
	ib_dev->modify_port		= hns_roce_modify_port;

	ib_dev->get_link_layer		= hns_roce_get_link_layer;

	ib_dev->get_netdev		= hns_roce_get_netdev;

	ib_dev->query_gid		= hns_roce_query_gid;

	ib_dev->add_gid			= hns_roce_add_gid;

	ib_dev->del_gid			= hns_roce_del_gid;

	ib_dev->query_pkey		= hns_roce_query_pkey;

drivers/infiniband/hw/mlx4/main.c

+1 −16
Original line number Diff line number Diff line
@@ -888,26 +888,11 @@ int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index, 
static int mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,

			     union ib_gid *gid)

{

	int ret;



	if (rdma_protocol_ib(ibdev, port))

		return __mlx4_ib_query_gid(ibdev, port, index, gid, 0);



	if (!rdma_protocol_roce(ibdev, port))

		return -ENODEV;



	if (!rdma_cap_roce_gid_table(ibdev, port))

		return -ENODEV;



	ret = ib_get_cached_gid(ibdev, port, index, gid, NULL);

	if (ret == -EAGAIN) {

		memcpy(gid, &zgid, sizeof(*gid));

	return 0;

}



	return ret;

}



static int mlx4_ib_query_sl2vl(struct ib_device *ibdev, u8 port, u64 *sl2vl_tbl)

{

	union sl2vl_tbl_to_u64 sl2vl64;

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static int ocrdma_register_device(struct ocrdma_dev *dev) 
	dev->ibdev.query_device = ocrdma_query_device;

	dev->ibdev.query_port = ocrdma_query_port;

	dev->ibdev.modify_port = ocrdma_modify_port;

	dev->ibdev.query_gid = ocrdma_query_gid;

	dev->ibdev.get_netdev = ocrdma_get_netdev;

	dev->ibdev.get_link_layer = ocrdma_link_layer;

	dev->ibdev.alloc_pd = ocrdma_alloc_pd;