Commit bd8c2021 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

RDMA/usnic: Instantiate data structures once 



Data structures should not be defined in a header file. Hence move
the min_transport_spec[] definition from a header file to a .c file.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Dave Goodell <dgoodell@cisco.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 4c23e508

drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h

+1 −24
Original line number Diff line number Diff line
@@ -84,30 +84,7 @@ struct usnic_ib_qp_grp_flow { 
	char				dentry_name[32];

};



static const struct

usnic_vnic_res_spec min_transport_spec[USNIC_TRANSPORT_MAX] = {

	{ /*USNIC_TRANSPORT_UNKNOWN*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

	{ /*USNIC_TRANSPORT_ROCE_CUSTOM*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_WQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_RQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_CQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

	{ /*USNIC_TRANSPORT_IPV4_UDP*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_WQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_RQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_CQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

};

extern const struct usnic_vnic_res_spec min_transport_spec[USNIC_TRANSPORT_MAX];



const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state);

int usnic_ib_qp_grp_dump_hdr(char *buf, int buf_sz);

drivers/infiniband/hw/usnic/usnic_ib_verbs.c

+24 −0
Original line number Diff line number Diff line
@@ -51,6 +51,30 @@ 


#define USNIC_DEFAULT_TRANSPORT USNIC_TRANSPORT_ROCE_CUSTOM



const struct usnic_vnic_res_spec min_transport_spec[USNIC_TRANSPORT_MAX] = {

	{ /*USNIC_TRANSPORT_UNKNOWN*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

	{ /*USNIC_TRANSPORT_ROCE_CUSTOM*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_WQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_RQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_CQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

	{ /*USNIC_TRANSPORT_IPV4_UDP*/

		.resources = {

			{.type = USNIC_VNIC_RES_TYPE_WQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_RQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_CQ,	.cnt = 1,},

			{.type = USNIC_VNIC_RES_TYPE_EOL,	.cnt = 0,},

		},

	},

};



static void usnic_ib_fw_string_to_u64(char *fw_ver_str, u64 *fw_ver)

{

	*fw_ver = *((u64 *)fw_ver_str);

CRA Git | Maintained and supported by SUSTech CRA and CCSE