2 files changed, 41 insertions, 16 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 904ff1571ba6..32d8f882e56c 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1133,20 +1133,34 @@ static int ipath_query_device(struct ib_device *ibdev,
         return 0;
 }
 
-const u8 ipath_cvt_physportstate[16] = {
-        [INFINIPATH_IBCS_LT_STATE_DISABLED] = 3,
-        [INFINIPATH_IBCS_LT_STATE_LINKUP] = 5,
-        [INFINIPATH_IBCS_LT_STATE_POLLACTIVE] = 2,
-        [INFINIPATH_IBCS_LT_STATE_POLLQUIET] = 2,
-        [INFINIPATH_IBCS_LT_STATE_SLEEPDELAY] = 1,
-        [INFINIPATH_IBCS_LT_STATE_SLEEPQUIET] = 1,
-        [INFINIPATH_IBCS_LT_STATE_CFGDEBOUNCE] = 4,
-        [INFINIPATH_IBCS_LT_STATE_CFGRCVFCFG] = 4,
-        [INFINIPATH_IBCS_LT_STATE_CFGWAITRMT] = 4,
-        [INFINIPATH_IBCS_LT_STATE_CFGIDLE] = 4,
-        [INFINIPATH_IBCS_LT_STATE_RECOVERRETRAIN] = 6,
-        [INFINIPATH_IBCS_LT_STATE_RECOVERWAITRMT] = 6,
-        [INFINIPATH_IBCS_LT_STATE_RECOVERIDLE] = 6,
+const u8 ipath_cvt_physportstate[32] = {
+        [INFINIPATH_IBCS_LT_STATE_DISABLED] = IB_PHYSPORTSTATE_DISABLED,
+        [INFINIPATH_IBCS_LT_STATE_LINKUP] = IB_PHYSPORTSTATE_LINKUP,
+        [INFINIPATH_IBCS_LT_STATE_POLLACTIVE] = IB_PHYSPORTSTATE_POLL,
+        [INFINIPATH_IBCS_LT_STATE_POLLQUIET] = IB_PHYSPORTSTATE_POLL,
+        [INFINIPATH_IBCS_LT_STATE_SLEEPDELAY] = IB_PHYSPORTSTATE_SLEEP,
+        [INFINIPATH_IBCS_LT_STATE_SLEEPQUIET] = IB_PHYSPORTSTATE_SLEEP,
+        [INFINIPATH_IBCS_LT_STATE_CFGDEBOUNCE] =
+                IB_PHYSPORTSTATE_CFG_TRAIN,
+        [INFINIPATH_IBCS_LT_STATE_CFGRCVFCFG] =
+                IB_PHYSPORTSTATE_CFG_TRAIN,
+        [INFINIPATH_IBCS_LT_STATE_CFGWAITRMT] =
+                IB_PHYSPORTSTATE_CFG_TRAIN,
+        [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)
@@ -1171,8 +1185,9 @@ static int ipath_query_port(struct ib_device *ibdev,
         ibcstat = dd->ipath_lastibcstat;
         props->state = ((ibcstat >> 4) & 0x3) + 1;
         /* See phys_state_show() */
-        props->phys_state = ipath_cvt_physportstate[
-                dd->ipath_lastibcstat & 0xf];
+        props->phys_state = /* MEA: assumes shift == 0 */
+                ipath_cvt_physportstate[dd->ipath_lastibcstat &
+                dd->ibcs_lts_mask];
         props->port_cap_flags = dev->port_cap_flags;
         props->gid_tbl_len = 1;
         props->max_msg_sz = 0x80000000;
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 1c8985012743..3d59736b49b2 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -832,7 +832,17 @@ unsigned ipath_get_pkey(struct ipath_devdata *, unsigned);
 
 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[];
+#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[];