IB/ipath: Add mappings from HW register to PortInfo port physical state
Add new mappings from port physical state (a HW register value) to the IB SubnGet(PortInfo) port physical state. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
6ac50727bd
commit
3d68ea3261
|
@ -1133,20 +1133,34 @@ static int ipath_query_device(struct ib_device *ibdev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const u8 ipath_cvt_physportstate[16] = {
|
const u8 ipath_cvt_physportstate[32] = {
|
||||||
[INFINIPATH_IBCS_LT_STATE_DISABLED] = 3,
|
[INFINIPATH_IBCS_LT_STATE_DISABLED] = IB_PHYSPORTSTATE_DISABLED,
|
||||||
[INFINIPATH_IBCS_LT_STATE_LINKUP] = 5,
|
[INFINIPATH_IBCS_LT_STATE_LINKUP] = IB_PHYSPORTSTATE_LINKUP,
|
||||||
[INFINIPATH_IBCS_LT_STATE_POLLACTIVE] = 2,
|
[INFINIPATH_IBCS_LT_STATE_POLLACTIVE] = IB_PHYSPORTSTATE_POLL,
|
||||||
[INFINIPATH_IBCS_LT_STATE_POLLQUIET] = 2,
|
[INFINIPATH_IBCS_LT_STATE_POLLQUIET] = IB_PHYSPORTSTATE_POLL,
|
||||||
[INFINIPATH_IBCS_LT_STATE_SLEEPDELAY] = 1,
|
[INFINIPATH_IBCS_LT_STATE_SLEEPDELAY] = IB_PHYSPORTSTATE_SLEEP,
|
||||||
[INFINIPATH_IBCS_LT_STATE_SLEEPQUIET] = 1,
|
[INFINIPATH_IBCS_LT_STATE_SLEEPQUIET] = IB_PHYSPORTSTATE_SLEEP,
|
||||||
[INFINIPATH_IBCS_LT_STATE_CFGDEBOUNCE] = 4,
|
[INFINIPATH_IBCS_LT_STATE_CFGDEBOUNCE] =
|
||||||
[INFINIPATH_IBCS_LT_STATE_CFGRCVFCFG] = 4,
|
IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
[INFINIPATH_IBCS_LT_STATE_CFGWAITRMT] = 4,
|
[INFINIPATH_IBCS_LT_STATE_CFGRCVFCFG] =
|
||||||
[INFINIPATH_IBCS_LT_STATE_CFGIDLE] = 4,
|
IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
[INFINIPATH_IBCS_LT_STATE_RECOVERRETRAIN] = 6,
|
[INFINIPATH_IBCS_LT_STATE_CFGWAITRMT] =
|
||||||
[INFINIPATH_IBCS_LT_STATE_RECOVERWAITRMT] = 6,
|
IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
[INFINIPATH_IBCS_LT_STATE_RECOVERIDLE] = 6,
|
[INFINIPATH_IBCS_LT_STATE_CFGIDLE] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[INFINIPATH_IBCS_LT_STATE_RECOVERRETRAIN] =
|
||||||
|
IB_PHYSPORTSTATE_LINK_ERR_RECOVER,
|
||||||
|
[INFINIPATH_IBCS_LT_STATE_RECOVERWAITRMT] =
|
||||||
|
IB_PHYSPORTSTATE_LINK_ERR_RECOVER,
|
||||||
|
[INFINIPATH_IBCS_LT_STATE_RECOVERIDLE] =
|
||||||
|
IB_PHYSPORTSTATE_LINK_ERR_RECOVER,
|
||||||
|
[0x10] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x11] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x12] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x13] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x14] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x15] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x16] = IB_PHYSPORTSTATE_CFG_TRAIN,
|
||||||
|
[0x17] = IB_PHYSPORTSTATE_CFG_TRAIN
|
||||||
};
|
};
|
||||||
|
|
||||||
u32 ipath_get_cr_errpkey(struct ipath_devdata *dd)
|
u32 ipath_get_cr_errpkey(struct ipath_devdata *dd)
|
||||||
|
@ -1171,8 +1185,9 @@ static int ipath_query_port(struct ib_device *ibdev,
|
||||||
ibcstat = dd->ipath_lastibcstat;
|
ibcstat = dd->ipath_lastibcstat;
|
||||||
props->state = ((ibcstat >> 4) & 0x3) + 1;
|
props->state = ((ibcstat >> 4) & 0x3) + 1;
|
||||||
/* See phys_state_show() */
|
/* See phys_state_show() */
|
||||||
props->phys_state = ipath_cvt_physportstate[
|
props->phys_state = /* MEA: assumes shift == 0 */
|
||||||
dd->ipath_lastibcstat & 0xf];
|
ipath_cvt_physportstate[dd->ipath_lastibcstat &
|
||||||
|
dd->ibcs_lts_mask];
|
||||||
props->port_cap_flags = dev->port_cap_flags;
|
props->port_cap_flags = dev->port_cap_flags;
|
||||||
props->gid_tbl_len = 1;
|
props->gid_tbl_len = 1;
|
||||||
props->max_msg_sz = 0x80000000;
|
props->max_msg_sz = 0x80000000;
|
||||||
|
|
|
@ -832,7 +832,17 @@ unsigned ipath_get_pkey(struct ipath_devdata *, unsigned);
|
||||||
|
|
||||||
extern const enum ib_wc_opcode ib_ipath_wc_opcode[];
|
extern const enum ib_wc_opcode ib_ipath_wc_opcode[];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Below converts HCA-specific LinkTrainingState to IB PhysPortState
|
||||||
|
* values.
|
||||||
|
*/
|
||||||
extern const u8 ipath_cvt_physportstate[];
|
extern const u8 ipath_cvt_physportstate[];
|
||||||
|
#define IB_PHYSPORTSTATE_SLEEP 1
|
||||||
|
#define IB_PHYSPORTSTATE_POLL 2
|
||||||
|
#define IB_PHYSPORTSTATE_DISABLED 3
|
||||||
|
#define IB_PHYSPORTSTATE_CFG_TRAIN 4
|
||||||
|
#define IB_PHYSPORTSTATE_LINKUP 5
|
||||||
|
#define IB_PHYSPORTSTATE_LINK_ERR_RECOVER 6
|
||||||
|
|
||||||
extern const int ib_ipath_state_ops[];
|
extern const int ib_ipath_state_ops[];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue