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

Commit aa4656d9 authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Doug Ledford
Browse files

IB/core: Move opa_class_port_info definition to header file 



Both opa_vnic and the hfi driver use the same opa_classport_info
definition. We will also have ib_sa capable of querying opa class
port info and would need this definition. Move it to ib_mad.h
for everyone to use.

Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 94d595c5

drivers/infiniband/hw/hfi1/mad.c

+0 −25
Original line number Diff line number Diff line
@@ -1994,31 +1994,6 @@ struct opa_pma_mad { 
	u8 data[2024];

} __packed;



struct opa_class_port_info {

	u8 base_version;

	u8 class_version;

	__be16 cap_mask;

	__be32 cap_mask2_resp_time;



	u8 redirect_gid[16];

	__be32 redirect_tc_fl;

	__be32 redirect_lid;

	__be32 redirect_sl_qp;

	__be32 redirect_qkey;



	u8 trap_gid[16];

	__be32 trap_tc_fl;

	__be32 trap_lid;

	__be32 trap_hl_qp;

	__be32 trap_qkey;



	__be16 trap_pkey;

	__be16 redirect_pkey;



	u8 trap_sl_rsvd;

	u8 reserved[3];

} __packed;



struct opa_port_status_req {

	__u8 port_num;

	__u8 reserved[3];

drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c

+0 −25
Original line number Diff line number Diff line
@@ -88,31 +88,6 @@ const char opa_vnic_driver_version[] = DRV_VERSION; 
/* Maximum number of VNIC ports supported */

#define OPA_VNIC_MAX_NUM_VPORT    255



struct opa_class_port_info {

	u8 base_version;

	u8 class_version;

	__be16 cap_mask;

	__be32 cap_mask2_resp_time;



	u8 redirect_gid[16];

	__be32 redirect_tc_fl;

	__be32 redirect_lid;

	__be32 redirect_sl_qp;

	__be32 redirect_qkey;



	u8 trap_gid[16];

	__be32 trap_tc_fl;

	__be32 trap_lid;

	__be32 trap_hl_qp;

	__be32 trap_qkey;



	__be16 trap_pkey;

	__be16 redirect_pkey;



	u8 trap_sl_rsvd;

	u8 reserved[3];

} __packed;



/**

 * struct opa_vnic_vema_port -- VNIC VEMA port details

 * @cport: pointer to port

include/rdma/ib_mad.h

+25 −0
Original line number Diff line number Diff line
@@ -262,6 +262,31 @@ struct ib_class_port_info { 
	__be32			trap_qkey;

};



struct opa_class_port_info {

	u8 base_version;

	u8 class_version;

	__be16 cap_mask;

	__be32 cap_mask2_resp_time;



	u8 redirect_gid[16];

	__be32 redirect_tc_fl;

	__be32 redirect_lid;

	__be32 redirect_sl_qp;

	__be32 redirect_qkey;



	u8 trap_gid[16];

	__be32 trap_tc_fl;

	__be32 trap_lid;

	__be32 trap_hl_qp;

	__be32 trap_qkey;



	__be16 trap_pkey;

	__be16 redirect_pkey;



	u8 trap_sl_rsvd;

	u8 reserved[3];

} __packed;



/**

 * ib_get_cpi_resp_time - Returns the resp_time value from

 * cap_mask2_resp_time in ib_class_port_info.