Commit 4106a758 authored by Michael Guralnik's avatar Michael Guralnik Committed by Jason Gunthorpe
Browse files

IB/mlx5: Report CapabilityMask2 in ib_query_port 



CapabilityMask2 exists when IB_PORT_CAP_MASK2_SUP is set in the original
capability mask. In such cases, query its value and report it in query
port.

Signed-off-by: default avatarMichael Guralnik <michaelgur@mellanox.com>
Reviewed-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a5a5d199

drivers/infiniband/hw/mlx5/mad.c

+4 −0
Original line number Diff line number Diff line
@@ -568,6 +568,10 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u8 port, 
	props->max_vl_num	= out_mad->data[37] >> 4;

	props->init_type_reply	= out_mad->data[41] >> 4;



	if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP)

		props->port_cap_flags2 =

			be16_to_cpup((__be16 *)(out_mad->data + 60));



	/* Check if extended speeds (EDR/FDR/...) are supported */

	if (props->port_cap_flags & IB_PORT_EXTENDED_SPEEDS_SUP) {

		ext_active_speed = out_mad->data[62] >> 4;

drivers/infiniband/hw/mlx5/main.c

+3 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,9 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, 
	props->subnet_timeout	= rep->subnet_timeout;

	props->init_type_reply	= rep->init_type_reply;



	if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP)

		props->port_cap_flags2 = rep->cap_mask2;



	err = mlx5_query_port_link_width_oper(mdev, &ib_link_width_oper, port);

	if (err)

		goto out;

include/linux/mlx5/driver.h

+2 −2
Original line number Diff line number Diff line
@@ -749,8 +749,8 @@ struct mlx5_hca_vport_context { 
	u64			node_guid;

	u32			cap_mask1;

	u32			cap_mask1_perm;

	u32			cap_mask2;

	u32			cap_mask2_perm;

	u16			cap_mask2;

	u16			cap_mask2_perm;

	u16			lid;

	u8			init_type_reply; /* bitmask: see ib spec 14.2.5.6 InitTypeReply */

	u8			lmc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE