Commit c7263e71 authored Sep 24, 2018 by Nathan Chancellor Committed by Greg Kroah-Hartman Nov 25, 2019

IB/mlx4: Avoid implicit enumerated type conversion



[ Upstream commit b56511c15713ba6c7572e77a41f7ddba9c1053ec ]

Clang warns when one enumerated type is implicitly converted to another.

drivers/infiniband/hw/mlx4/mad.c:1811:41: warning: implicit conversion
from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration
type 'enum ib_qp_create_flags' [-Wenum-conversion]
                qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_TUNNEL_QP;
                                                    ~ ^~~~~~~~~~~~~~~~~~~~~~~

drivers/infiniband/hw/mlx4/mad.c:1819:41: warning: implicit conversion
from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration
type 'enum ib_qp_create_flags' [-Wenum-conversion]
                qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_SQP;
                                                    ~ ^~~~~~~~~~~~~~~~~

The type mlx4_ib_qp_flags explicitly provides supplemental values to the
type ib_qp_create_flags. Make that clear to Clang by changing the
create_flags type to u32.

Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 312efa12

include/rdma/ib_verbs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1026,7 +1026,7 @@ struct ib_qp_init_attr {
		struct ib_qp_cap cap;
		enum ib_sig_type sq_sig_type;
		enum ib_qp_type qp_type;
		enum ib_qp_create_flags create_flags;
		u32 create_flags;

		/*
		* Only needed for special QP types, or when using the RW API.