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

Commit 149983af authored by Dotan Barak's avatar Dotan Barak Committed by Roland Dreier
Browse files

mlx4_core: Get the maximum message size from reported device capabilities 



Get the maximum message size from the device capabilities returned
from the QUERY_DEV_CAP firmware command, rather than hard-coding 2 GB.

Signed-off-by: default avatarDotan Barak <dotanb@dev.mellanox.co.il>
Signed-off-by: default avatarMichael S. Tsirkin <mst@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 87427da5

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port, 
	props->phys_state	= out_mad->data[33] >> 4;

	props->port_cap_flags	= be32_to_cpup((__be32 *) (out_mad->data + 20));

	props->gid_tbl_len	= to_mdev(ibdev)->dev->caps.gid_table_len[port];

	props->max_msg_sz	= 0x80000000;

	props->max_msg_sz	= to_mdev(ibdev)->dev->caps.max_msg_sz;

	props->pkey_tbl_len	= to_mdev(ibdev)->dev->caps.pkey_table_len[port];

	props->bad_pkey_cntr	= be16_to_cpup((__be16 *) (out_mad->data + 46));

	props->qkey_viol_cntr	= be16_to_cpup((__be16 *) (out_mad->data + 48));

drivers/net/mlx4/fw.c

+3 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
#define QUERY_DEV_CAP_ACK_DELAY_OFFSET		0x35

#define QUERY_DEV_CAP_MTU_WIDTH_OFFSET		0x36

#define QUERY_DEV_CAP_VL_PORT_OFFSET		0x37

#define QUERY_DEV_CAP_MAX_MSG_SZ_OFFSET		0x38

#define QUERY_DEV_CAP_MAX_GID_OFFSET		0x3b

#define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET	0x3c

#define QUERY_DEV_CAP_MAX_PKEY_OFFSET		0x3f
@@ -220,6 +221,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	dev_cap->local_ca_ack_delay = field & 0x1f;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET);

	dev_cap->num_ports = field & 0xf;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MSG_SZ_OFFSET);

	dev_cap->max_msg_sz = 1 << (field & 0x1f);

	MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);

	dev_cap->stat_rate_support = stat_rate;

	MLX4_GET(dev_cap->flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);

drivers/net/mlx4/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct mlx4_dev_cap { 
	int max_rdma_global;

	int local_ca_ack_delay;

	int num_ports;

	u32 max_msg_sz;

	int max_mtu[MLX4_MAX_PORTS + 1];

	int max_port_width[MLX4_MAX_PORTS + 1];

	int max_vl[MLX4_MAX_PORTS + 1];

drivers/net/mlx4/main.c

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static int __devinit mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev 
	dev->caps.reserved_uars	     = dev_cap->reserved_uars;

	dev->caps.reserved_pds	     = dev_cap->reserved_pds;

	dev->caps.mtt_entry_sz	     = MLX4_MTT_ENTRY_PER_SEG * dev_cap->mtt_entry_sz;

	dev->caps.max_msg_sz         = dev_cap->max_msg_sz;

	dev->caps.page_size_cap	     = ~(u32) (dev_cap->min_page_sz - 1);

	dev->caps.flags		     = dev_cap->flags;

	dev->caps.stat_rate_support  = dev_cap->stat_rate_support;

include/linux/mlx4/device.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ struct mlx4_caps { 
	int			num_pds;

	int			reserved_pds;

	int			mtt_entry_sz;

	u32			max_msg_sz;

	u32			page_size_cap;

	u32			flags;

	u16			stat_rate_support;