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

Commit 0629cb06 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/core: Move SM class defines from ib_mad.h to ib_smi.h 



When the hfi1 driver was added these definitions were moved from the qib driver
to ib_mad.h to be used by both qib and hfi1.  They should have been moved to
ib_smi.h instead.

Fixes: d4ab3470 ("IB/core: Add core header changes needed for OPA")
Reviewed-by: default avatarHal Rosenstock <hal@mellanox.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ce755c9b

drivers/infiniband/hw/qib/qib_ruc.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */



#include <linux/spinlock.h>

#include <rdma/ib_smi.h>



#include "qib.h"

#include "qib_mad.h"

include/rdma/ib_mad.h

+0 −45
Original line number Diff line number Diff line
@@ -144,31 +144,6 @@ 
#define IB_NOTICE_PROD_ROUTER		cpu_to_be16(3)

#define IB_NOTICE_PROD_CLASS_MGR	cpu_to_be16(4)



/*

 * Generic trap/notice numbers

 */

#define IB_NOTICE_TRAP_LLI_THRESH	cpu_to_be16(129)

#define IB_NOTICE_TRAP_EBO_THRESH	cpu_to_be16(130)

#define IB_NOTICE_TRAP_FLOW_UPDATE	cpu_to_be16(131)

#define IB_NOTICE_TRAP_CAP_MASK_CHG	cpu_to_be16(144)

#define IB_NOTICE_TRAP_SYS_GUID_CHG	cpu_to_be16(145)

#define IB_NOTICE_TRAP_BAD_MKEY		cpu_to_be16(256)

#define IB_NOTICE_TRAP_BAD_PKEY		cpu_to_be16(257)

#define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)



/*

 * Generic trap/notice other local changes flags (trap 144).

 */

#define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */

#define IB_NOTICE_TRAP_LWE_CHG		0x02	/* Link Width Enable changed */

#define IB_NOTICE_TRAP_NODE_DESC_CHG	0x01



/*

 * Generic trap/notice M_Key volation flags in dr_trunc_hop (trap 256).

 */

#define IB_NOTICE_TRAP_DR_NOTICE	0x80

#define IB_NOTICE_TRAP_DR_TRUNC		0x40



enum {

	IB_MGMT_MAD_HDR = 24,

	IB_MGMT_MAD_DATA = 232,
@@ -282,21 +257,6 @@ struct ib_class_port_info { 
	__be32			trap_qkey;

};



struct ib_node_info {

	u8 base_version;

	u8 class_version;

	u8 node_type;

	u8 num_ports;

	__be64 sys_guid;

	__be64 node_guid;

	__be64 port_guid;

	__be16 partition_cap;

	__be16 device_id;

	__be32 revision;

	u8 local_port_num;

	u8 vendor_id[3];

} __packed;



struct ib_mad_notice_attr {

	u8 generic_type;

	u8 prod_type_msb;
@@ -361,11 +321,6 @@ struct ib_mad_notice_attr { 
	} details;

};



struct ib_vl_weight_elem {

	u8      vl;     /* VL is low 5 bits, upper 3 bits reserved */

	u8      weight;

};



/**

 * ib_mad_send_buf - MAD data buffer and work request for sends.

 * @next: A pointer used to chain together MADs for posting.

include/rdma/ib_smi.h

+47 −0
Original line number Diff line number Diff line
@@ -119,10 +119,57 @@ struct ib_port_info { 
	u8 link_roundtrip_latency[3];

};



struct ib_node_info {

	u8 base_version;

	u8 class_version;

	u8 node_type;

	u8 num_ports;

	__be64 sys_guid;

	__be64 node_guid;

	__be64 port_guid;

	__be16 partition_cap;

	__be16 device_id;

	__be32 revision;

	u8 local_port_num;

	u8 vendor_id[3];

} __packed;



struct ib_vl_weight_elem {

	u8      vl;     /* IB: VL is low 4 bits, upper 4 bits reserved */

                        /* OPA: VL is low 5 bits, upper 3 bits reserved */

	u8      weight;

};



static inline u8

ib_get_smp_direction(struct ib_smp *smp)

{

	return ((smp->status & IB_SMP_DIRECTION) == IB_SMP_DIRECTION);

}



/*

 * SM Trap/Notice numbers

 */

#define IB_NOTICE_TRAP_LLI_THRESH	cpu_to_be16(129)

#define IB_NOTICE_TRAP_EBO_THRESH	cpu_to_be16(130)

#define IB_NOTICE_TRAP_FLOW_UPDATE	cpu_to_be16(131)

#define IB_NOTICE_TRAP_CAP_MASK_CHG	cpu_to_be16(144)

#define IB_NOTICE_TRAP_SYS_GUID_CHG	cpu_to_be16(145)

#define IB_NOTICE_TRAP_BAD_MKEY		cpu_to_be16(256)

#define IB_NOTICE_TRAP_BAD_PKEY		cpu_to_be16(257)

#define IB_NOTICE_TRAP_BAD_QKEY		cpu_to_be16(258)



/*

 * Other local changes flags (trap 144).

 */

#define IB_NOTICE_TRAP_LSE_CHG		0x04	/* Link Speed Enable changed */

#define IB_NOTICE_TRAP_LWE_CHG		0x02	/* Link Width Enable changed */

#define IB_NOTICE_TRAP_NODE_DESC_CHG	0x01



/*

 * M_Key volation flags in dr_trunc_hop (trap 256).

 */

#define IB_NOTICE_TRAP_DR_NOTICE	0x80

#define IB_NOTICE_TRAP_DR_TRUNC		0x40





#endif /* IB_SMI_H */