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

Commit c4550c63 authored by Or Gerlitz's avatar Or Gerlitz Committed by Doug Ledford
Browse files

IB: Query ports via the core instead of direct into the driver 



Change the drivers to call ib_query_port in their get port
immutable handler instead of their own query port handler.

Doing this required to set the core cap flags of this device
before the ib_query_port call is made, since the IB core might
need these caps to serve the port query.

Drivers are ensured by the IB core that the port attributes passed
to the port query verb implementation are zero, and hence we
removed the zeroing from the drivers.

This patch doesn't add any new functionality.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Acked-by: default avatarAdit Ranadive <aditr@vmware.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ce1e055f

drivers/infiniband/hw/cxgb3/iwch_provider.c

+4 −3
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ static int iwch_query_port(struct ib_device *ibdev, 
	dev = to_iwch_dev(ibdev);

	netdev = dev->rdev.port_info.lldevs[port-1];



	memset(props, 0, sizeof(struct ib_port_attr));

	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;
@@ -1338,13 +1338,14 @@ static int iwch_port_immutable(struct ib_device *ibdev, u8 port_num, 
	struct ib_port_attr attr;

	int err;



	err = iwch_query_port(ibdev, port_num, &attr);

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	err = ib_query_port(ibdev, port_num, &attr);

	if (err)

		return err;



	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}

drivers/infiniband/hw/cxgb4/provider.c

+4 −4
Original line number Diff line number Diff line
@@ -358,8 +358,7 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port, 


	dev = to_c4iw_dev(ibdev);

	netdev = dev->rdev.lldi.ports[port-1];



	memset(props, 0, sizeof(struct ib_port_attr));

	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;
@@ -505,13 +504,14 @@ static int c4iw_port_immutable(struct ib_device *ibdev, u8 port_num, 
	struct ib_port_attr attr;

	int err;



	err = c4iw_query_port(ibdev, port_num, &attr);

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	err = ib_query_port(ibdev, port_num, &attr);

	if (err)

		return err;



	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}

drivers/infiniband/hw/hfi1/verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -1384,6 +1384,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num, 
	struct hfi1_pportdata *ppd = &dd->pport[port_num - 1];

	u16 lid = ppd->lid;



	/* props being zeroed by the caller, avoid zeroing it here */

	props->lid = lid ? lid : 0;

	props->lmc = ppd->lmc;

	/* OPA logical states match IB logical states */

drivers/infiniband/hw/hns/hns_roce_main.c

+4 −3
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int hns_roce_query_port(struct ib_device *ib_dev, u8 port_num, 
	assert(port_num > 0);

	port = port_num - 1;



	memset(props, 0, sizeof(*props));

	/* props being zeroed by the caller, avoid zeroing it here */



	props->max_mtu = hr_dev->caps.max_mtu;

	props->gid_tbl_len = hr_dev->caps.gid_table_len[port];
@@ -400,14 +400,15 @@ static int hns_roce_port_immutable(struct ib_device *ib_dev, u8 port_num, 
	struct ib_port_attr attr;

	int ret;



	ret = hns_roce_query_port(ib_dev, port_num, &attr);

	immutable->core_cap_flags = RDMA_CORE_PORT_IBA_ROCE;



	ret = ib_query_port(ib_dev, port_num, &attr);

	if (ret)

		return ret;



	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;



	immutable->core_cap_flags = RDMA_CORE_PORT_IBA_ROCE;

	immutable->max_mad_size = IB_MGMT_MAD_SIZE;



	return 0;

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+4 −4
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static int i40iw_query_port(struct ib_device *ibdev, 
	struct i40iw_device *iwdev = to_iwdev(ibdev);

	struct net_device *netdev = iwdev->netdev;



	memset(props, 0, sizeof(*props));



	/* props being zeroed by the caller, avoid zeroing it here */

	props->max_mtu = IB_MTU_4096;

	if (netdev->mtu >= 4096)

		props->active_mtu = IB_MTU_4096;
@@ -2506,14 +2505,15 @@ static int i40iw_port_immutable(struct ib_device *ibdev, u8 port_num, 
	struct ib_port_attr attr;

	int err;



	err = i40iw_query_port(ibdev, port_num, &attr);

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	err = ib_query_port(ibdev, port_num, &attr);



	if (err)

		return err;



	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}