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

Commit da2ab62a authored by Leonid Arsh's avatar Leonid Arsh Committed by Roland Dreier
Browse files

IB: Move struct port_info from ipath to <rdma/ib_smi.h> 



Move ipath's struct port_info into <rdma/ib_smi.h>, so that it can be
used by mthca to implement client reregister support.

Remove the __attribute__((packed)) because all the members of the struct
are naturally aligned anyway.

Signed-off-by: default avatarLeonid Arsh <leonida@voltaire.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 508e4341

drivers/infiniband/hw/ipath/ipath_mad.c

+2 −38
Original line number Diff line number Diff line
@@ -137,47 +137,11 @@ static int recv_subn_get_guidinfo(struct ib_smp *smp, 
	return reply(smp);

}



struct port_info {

	__be64 mkey;

	__be64 gid_prefix;

	__be16 lid;

	__be16 sm_lid;

	__be32 cap_mask;

	__be16 diag_code;

	__be16 mkey_lease_period;

	u8 local_port_num;

	u8 link_width_enabled;

	u8 link_width_supported;

	u8 link_width_active;

	u8 linkspeed_portstate;			/* 4 bits, 4 bits */

	u8 portphysstate_linkdown;		/* 4 bits, 4 bits */

	u8 mkeyprot_resv_lmc;			/* 2 bits, 3, 3 */

	u8 linkspeedactive_enabled;		/* 4 bits, 4 bits */

	u8 neighbormtu_mastersmsl;		/* 4 bits, 4 bits */

	u8 vlcap_inittype;			/* 4 bits, 4 bits */

	u8 vl_high_limit;

	u8 vl_arb_high_cap;

	u8 vl_arb_low_cap;

	u8 inittypereply_mtucap;		/* 4 bits, 4 bits */

	u8 vlstallcnt_hoqlife;			/* 3 bits, 5 bits */

	u8 operationalvl_pei_peo_fpi_fpo;	/* 4 bits, 1, 1, 1, 1 */

	__be16 mkey_violations;

	__be16 pkey_violations;

	__be16 qkey_violations;

	u8 guid_cap;

	u8 clientrereg_resv_subnetto;		/* 1 bit, 2 bits, 5 */

	u8 resv_resptimevalue;			/* 3 bits, 5 bits */

	u8 localphyerrors_overrunerrors;	/* 4 bits, 4 bits */

	__be16 max_credit_hint;

	u8 resv;

	u8 link_roundtrip_latency[3];

} __attribute__ ((packed));



static int recv_subn_get_portinfo(struct ib_smp *smp,

				  struct ib_device *ibdev, u8 port)

{

	struct ipath_ibdev *dev;

	struct port_info *pip = (struct port_info *)smp->data;

	struct ib_port_info *pip = (struct ib_port_info *)smp->data;

	u16 lid;

	u8 ibcstat;

	u8 mtu;
@@ -312,7 +276,7 @@ static int recv_subn_set_guidinfo(struct ib_smp *smp, 
static int recv_subn_set_portinfo(struct ib_smp *smp,

				  struct ib_device *ibdev, u8 port)

{

	struct port_info *pip = (struct port_info *)smp->data;

	struct ib_port_info *pip = (struct ib_port_info *)smp->data;

	struct ib_event event;

	struct ipath_ibdev *dev;

	u32 flags;

include/rdma/ib_smi.h

+36 −0
Original line number Diff line number Diff line
@@ -85,6 +85,42 @@ struct ib_smp { 
#define IB_SMP_ATTR_LED_INFO			__constant_htons(0x0031)

#define IB_SMP_ATTR_VENDOR_MASK			__constant_htons(0xFF00)



struct ib_port_info {

	__be64 mkey;

	__be64 gid_prefix;

	__be16 lid;

	__be16 sm_lid;

	__be32 cap_mask;

	__be16 diag_code;

	__be16 mkey_lease_period;

	u8 local_port_num;

	u8 link_width_enabled;

	u8 link_width_supported;

	u8 link_width_active;

	u8 linkspeed_portstate;			/* 4 bits, 4 bits */

	u8 portphysstate_linkdown;		/* 4 bits, 4 bits */

	u8 mkeyprot_resv_lmc;			/* 2 bits, 3, 3 */

	u8 linkspeedactive_enabled;		/* 4 bits, 4 bits */

	u8 neighbormtu_mastersmsl;		/* 4 bits, 4 bits */

	u8 vlcap_inittype;			/* 4 bits, 4 bits */

	u8 vl_high_limit;

	u8 vl_arb_high_cap;

	u8 vl_arb_low_cap;

	u8 inittypereply_mtucap;		/* 4 bits, 4 bits */

	u8 vlstallcnt_hoqlife;			/* 3 bits, 5 bits */

	u8 operationalvl_pei_peo_fpi_fpo;	/* 4 bits, 1, 1, 1, 1 */

	__be16 mkey_violations;

	__be16 pkey_violations;

	__be16 qkey_violations;

	u8 guid_cap;

	u8 clientrereg_resv_subnetto;		/* 1 bit, 2 bits, 5 */

	u8 resv_resptimevalue;			/* 3 bits, 5 bits */

	u8 localphyerrors_overrunerrors;	/* 4 bits, 4 bits */

	__be16 max_credit_hint;

	u8 resv;

	u8 link_roundtrip_latency[3];

};



static inline u8

ib_get_smp_direction(struct ib_smp *smp)

{