Commit 376ceb31 authored by Aharon Landau's avatar Aharon Landau Committed by Jason Gunthorpe
Browse files

RDMA: Fix link active_speed size 

According to the IB spec active_speed size should be u16 and not u8 as
before. Changing it to allow further extensions in offered speeds.

Link: https://lore.kernel.org/r/20200917090223.1018224-4-leon@kernel.org


Signed-off-by: default avatarAharon Landau <aharonl@mellanox.com>
Reviewed-by: default avatarMichael Guralnik <michaelgur@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent e27014bd

drivers/infiniband/core/uverbs_std_types_device.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ void copy_port_attr_to_resp(struct ib_port_attr *attr, 
	resp->subnet_timeout = attr->subnet_timeout;

	resp->init_type_reply = attr->init_type_reply;

	resp->active_width = attr->active_width;

	resp->active_speed = attr->active_speed;

	/* This ABI needs to be extended to provide any speed more than IB_SPEED_NDR */

	resp->active_speed = min_t(u16, attr->active_speed, IB_SPEED_NDR);

	resp->phys_state = attr->phys_state;

	resp->link_layer = rdma_port_get_link_layer(ib_dev, port_num);

}

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr, 
}

EXPORT_SYMBOL(ib_modify_qp_with_udata);



int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8 *width)

int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u16 *speed, u8 *width)

{

	int rc;

	u32 netdev_speed;

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct bnxt_re_dev { 


	struct delayed_work		worker;

	u8				cur_prio_map;

	u8				active_speed;

	u16				active_speed;

	u8				active_width;



	/* FP Notification Queue (CQ & SRQ) */

drivers/infiniband/hw/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num, 
	props->gid_tbl_len = HFI1_GUIDS_PER_PORT;

	props->active_width = (u8)opa_width_to_ib(ppd->link_width_active);

	/* see rate_show() in ib core/sysfs.c */

	props->active_speed = (u8)opa_speed_to_ib(ppd->link_speed_active);

	props->active_speed = opa_speed_to_ib(ppd->link_speed_active);

	props->max_vl_num = ppd->vls_supported;



	/* Once we are a "first class" citizen and have added the OPA MTUs to

drivers/infiniband/hw/mlx5/main.c

+2 −6
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, 
	bool put_mdev = true;

	u16 qkey_viol_cntr;

	u32 eth_prot_oper;

	u16 active_speed;

	u8 mdev_port_num;

	bool ext;

	int err;
@@ -491,12 +490,9 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, 
	props->active_width     = IB_WIDTH_4X;

	props->active_speed     = IB_SPEED_QDR;



	translate_eth_proto_oper(eth_prot_oper, &active_speed,

	translate_eth_proto_oper(eth_prot_oper, &props->active_speed,

				 &props->active_width, ext);



	WARN_ON_ONCE(active_speed & ~0xFF);

	props->active_speed = (u8)active_speed;



	props->port_cap_flags |= IB_PORT_CM_SUP;

	props->ip_gids = true;
@@ -1307,7 +1303,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, 
		props->port_cap_flags2 = rep->cap_mask2;



	err = mlx5_query_ib_port_oper(mdev, &ib_link_width_oper,

				      (u16 *)&props->active_speed, port);

				      &props->active_speed, port);

	if (err)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE