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

Commit 5038056e authored by David Decotigny's avatar David Decotigny Committed by David S. Miller
Browse files

mlx4: remove unused fields 



This also can address following UBSAN warnings:
[   36.640343] ================================================================================
[   36.648772] UBSAN: Undefined behaviour in drivers/net/ethernet/mellanox/mlx4/fw.c:857:26
[   36.656853] shift exponent 64 is too large for 32-bit type 'int'
[   36.663348] ================================================================================
[   36.671783] ================================================================================
[   36.680213] UBSAN: Undefined behaviour in drivers/net/ethernet/mellanox/mlx4/fw.c:861:27
[   36.688297] shift exponent 35 is too large for 32-bit type 'int'
[   36.694702] ================================================================================

Tested:
  reboot with UBSAN, no warning.

Signed-off-by: default avatarDavid Decotigny <decot@googlers.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd11f074

drivers/net/ethernet/mellanox/mlx4/fw.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -853,12 +853,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	dev_cap->max_eqs = 1 << (field & 0xf);

	dev_cap->max_eqs = 1 << (field & 0xf);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);

	dev_cap->reserved_mtts = 1 << (field >> 4);

	dev_cap->reserved_mtts = 1 << (field >> 4);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MRW_SZ_OFFSET);

	dev_cap->max_mrw_sz = 1 << field;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MRW_OFFSET);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MRW_OFFSET);

	dev_cap->reserved_mrws = 1 << (field & 0xf);

	dev_cap->reserved_mrws = 1 << (field & 0xf);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MTT_SEG_OFFSET);

	dev_cap->max_mtt_seg = 1 << (field & 0x3f);

	MLX4_GET(size, outbox, QUERY_DEV_CAP_NUM_SYS_EQ_OFFSET);

	MLX4_GET(size, outbox, QUERY_DEV_CAP_NUM_SYS_EQ_OFFSET);

	dev_cap->num_sys_eqs = size & 0xfff;

	dev_cap->num_sys_eqs = size & 0xfff;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_REQ_QP_OFFSET);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_REQ_QP_OFFSET);

drivers/net/ethernet/mellanox/mlx4/fw.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -80,9 +80,7 @@ struct mlx4_dev_cap { 
	int max_eqs;

	int max_eqs;

	int num_sys_eqs;

	int num_sys_eqs;

	int reserved_mtts;

	int reserved_mtts;

	int max_mrw_sz;

	int reserved_mrws;

	int reserved_mrws;

	int max_mtt_seg;

	int max_requester_per_qp;

	int max_requester_per_qp;

	int max_responder_per_qp;

	int max_responder_per_qp;

	int max_rdma_global;

	int max_rdma_global;