IB/hfi1: Modify handling of physical link state by Host Driver

Ensure states returned to the Fabric Manager are consistent with
the OPA specification by caching the physical state along with the
logical state.

Reviewed-by: Stuart Summers <john.s.summers@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Andrzej Kotlowski <andrzej.kotlowski@intel.com>
Signed-off-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 99c29ddcca358fbda5e710de4178cb2e462d2413..3fae98d079e4897173c2210f5cd48ceca8e17b9e 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -1066,6 +1066,8 @@ static int thermal_init(struct hfi1_devdata *dd);
 
 static int wait_logical_linkstate(struct hfi1_pportdata *ppd, u32 state,
                                  int msecs);
+static int wait_physical_linkstate(struct hfi1_pportdata *ppd, u32 state,
+                                  int msecs);
 static void read_planned_down_reason_code(struct hfi1_devdata *dd, u8 *pdrrc);
 static void read_link_down_reason(struct hfi1_devdata *dd, u8 *ldr);
 static void handle_temp_err(struct hfi1_devdata *dd);
@@ -10028,28 +10030,6 @@ static void set_lidlmc(struct hfi1_pportdata *ppd)
        sdma_update_lmc(dd, mask, ppd->lid);
 }
 
-static int wait_phy_linkstate(struct hfi1_devdata *dd, u32 state, u32 msecs)
-{
-       unsigned long timeout;
-       u32 curr_state;
-
-       timeout = jiffies + msecs_to_jiffies(msecs);
-       while (1) {
-               curr_state = read_physical_state(dd);
-               if (curr_state == state)
-                       break;
-               if (time_after(jiffies, timeout)) {
-                       dd_dev_err(dd,
-                                  "timeout waiting for phy link state 0x%x, current state is 0x%x\n",
-                                  state, curr_state);
-                       return -ETIMEDOUT;
-               }
-               usleep_range(1950, 2050); /* sleep 2ms-ish */
-       }
-
-       return 0;
-}
-
 static const char *state_completed_string(u32 completed)
 {
        static const char * const state_completed[] = {
@@ -10283,7 +10263,7 @@ static int goto_offline(struct hfi1_pportdata *ppd, u8 rem_reason)
 
        if (do_wait) {
                /* it can take a while for the link to go down */
-               ret = wait_phy_linkstate(dd, PLS_OFFLINE, 10000);
+               ret = wait_physical_linkstate(ppd, PLS_OFFLINE, 10000);
                if (ret < 0)
                        return ret;
        }
@@ -10536,6 +10516,19 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                        goto unexpected;
                }
 
+               /*
+                * Wait for Link_Up physical state.
+                * Physical and Logical states should already be
+                * be transitioned to LinkUp and LinkInit respectively.
+                */
+               ret = wait_physical_linkstate(ppd, PLS_LINKUP, 1000);
+               if (ret) {
+                       dd_dev_err(dd,
+                                  "%s: physical state did not change to LINK-UP\n",
+                                  __func__);
+                       break;
+               }
+
                ret = wait_logical_linkstate(ppd, IB_PORT_INIT, 1000);
                if (ret) {
                        dd_dev_err(dd,
@@ -10649,6 +10642,8 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                 */
                if (ret)
                        goto_offline(ppd, 0);
+               else
+                       cache_physical_state(ppd);
                break;
        case HLS_DN_DISABLE:
                /* link is disabled */
@@ -10673,6 +10668,13 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                                ret = -EINVAL;
                                break;
                        }
+                       ret = wait_physical_linkstate(ppd, PLS_DISABLED, 10000);
+                       if (ret) {
+                               dd_dev_err(dd,
+                                          "%s: physical state did not change to DISABLED\n",
+                                          __func__);
+                               break;
+                       }
                        dc_shutdown(dd);
                }
                ppd->host_link_state = HLS_DN_DISABLE;
@@ -10690,6 +10692,7 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                if (ppd->host_link_state != HLS_DN_POLL)
                        goto unexpected;
                ppd->host_link_state = HLS_VERIFY_CAP;
+               cache_physical_state(ppd);
                break;
        case HLS_GOING_UP:
                if (ppd->host_link_state != HLS_VERIFY_CAP)
@@ -12663,21 +12666,56 @@ static int wait_logical_linkstate(struct hfi1_pportdata *ppd, u32 state,
        return -ETIMEDOUT;
 }
 
-u8 hfi1_ibphys_portstate(struct hfi1_pportdata *ppd)
+/*
+ * Read the physical hardware link state and set the driver's cached value
+ * of it.
+ */
+void cache_physical_state(struct hfi1_pportdata *ppd)
 {
-       u32 pstate;
+       u32 read_pstate;
        u32 ib_pstate;
 
-       pstate = read_physical_state(ppd->dd);
-       ib_pstate = chip_to_opa_pstate(ppd->dd, pstate);
-       if (ppd->last_pstate != ib_pstate) {
+       read_pstate = read_physical_state(ppd->dd);
+       ib_pstate = chip_to_opa_pstate(ppd->dd, read_pstate);
+       /* check if OPA pstate changed */
+       if (chip_to_opa_pstate(ppd->dd, ppd->pstate) != ib_pstate) {
                dd_dev_info(ppd->dd,
                            "%s: physical state changed to %s (0x%x), phy 0x%x\n",
                            __func__, opa_pstate_name(ib_pstate), ib_pstate,
-                           pstate);
-               ppd->last_pstate = ib_pstate;
+                           read_pstate);
+       }
+       ppd->pstate = read_pstate;
+}
+
+/*
+ * wait_physical_linkstate - wait for an physical link state change to occur
+ * @ppd: port device
+ * @state: the state to wait for
+ * @msecs: the number of milliseconds to wait
+ *
+ * Wait up to msecs milliseconds for physical link state change to occur.
+ * Returns 0 if state reached, otherwise -ETIMEDOUT.
+ */
+static int wait_physical_linkstate(struct hfi1_pportdata *ppd, u32 state,
+                                  int msecs)
+{
+       unsigned long timeout;
+
+       timeout = jiffies + msecs_to_jiffies(msecs);
+       while (1) {
+               cache_physical_state(ppd);
+               if (ppd->pstate == state)
+                       break;
+               if (time_after(jiffies, timeout)) {
+                       dd_dev_err(ppd->dd,
+                                  "timeout waiting for phy link state 0x%x, current state is 0x%x\n",
+                                  state, ppd->pstate);
+                       return -ETIMEDOUT;
+               }
+               usleep_range(1950, 2050); /* sleep 2ms-ish */
        }
-       return ib_pstate;
+
+       return 0;
 }
 
 #define CLEAR_STATIC_RATE_CONTROL_SMASK(r) \
@@ -14781,7 +14819,7 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
                /* start in offline */
                ppd->host_link_state = HLS_DN_OFFLINE;
                init_vl_arb_caches(ppd);
-               ppd->last_pstate = 0xff; /* invalid value */
+               ppd->pstate = PLS_OFFLINE;
        }
 
        dd->link_default = HLS_DN_POLL;

diff --git a/drivers/infiniband/hw/hfi1/chip.h b/drivers/infiniband/hw/hfi1/chip.h
index 0b4f418ba0ac4b120cbb5680f851ca7a5e63282a..3dab3156ba4ac3dc22a7d18e67fb2c01aeeaae3f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.h
+++ b/drivers/infiniband/hw/hfi1/chip.h
@@ -744,6 +744,7 @@ int is_bx(struct hfi1_devdata *dd);
 u32 read_physical_state(struct hfi1_devdata *dd);
 u32 chip_to_opa_pstate(struct hfi1_devdata *dd, u32 chip_pstate);
 u32 get_logical_state(struct hfi1_pportdata *ppd);
+void cache_physical_state(struct hfi1_pportdata *ppd);
 const char *opa_lstate_name(u32 lstate);
 const char *opa_pstate_name(u32 pstate);
 u32 driver_physical_state(struct hfi1_pportdata *ppd);
@@ -1354,7 +1355,6 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd);
 void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt);
 u32 hfi1_read_cntrs(struct hfi1_devdata *dd, char **namep, u64 **cntrp);
 u32 hfi1_read_portcntrs(struct hfi1_pportdata *ppd, char **namep, u64 **cntrp);
-u8 hfi1_ibphys_portstate(struct hfi1_pportdata *ppd);
 int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which);
 int hfi1_set_ib_cfg(struct hfi1_pportdata *ppd, int which, u32 val);
 int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt, u16 jkey);

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index 9e59430bc55c591f8cb7d035e4f1b4bab9018df5..e64e9e28c936ef00f0026270345ef427d46a9277 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -906,10 +906,12 @@ static inline int set_armed_to_active(struct hfi1_ctxtdata *rcd,
                sc = hfi1_9B_get_sc5(hdr, packet->rhf);
        }
        if (sc != SC15_PACKET) {
-               int hwstate = read_logical_state(dd);
+               int hwstate = driver_lstate(rcd->ppd);
 
-               if (hwstate != LSTATE_ACTIVE) {
-                       dd_dev_info(dd, "Unexpected link state %d\n", hwstate);
+               if (hwstate != IB_PORT_ACTIVE) {
+                       dd_dev_info(dd,
+                                   "Unexpected link state %s\n",
+                                   opa_lstate_name(hwstate));
                        return 0;
                }
 

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 8f74cf6d6c9a387e9a2d01dcfadc2208efa77df1..bca781c3b5ac0888d64eebc781c495d15350c833 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -663,7 +663,7 @@ struct hfi1_pportdata {
        u8 link_enabled;        /* link enabled? */
        u8 linkinit_reason;
        u8 local_tx_rate;       /* rate given to 8051 firmware */
-       u8 last_pstate;         /* info only */
+       u8 pstate;              /* info only */
        u8 qsfp_retry_count;
 
        /* placeholders for IB MAD packet settings */
@@ -1330,6 +1330,22 @@ static inline u32 driver_lstate(struct hfi1_pportdata *ppd)
                return ppd->lstate;
 }
 
+/* return the driver's idea of the physical OPA port state */
+static inline u32 driver_pstate(struct hfi1_pportdata *ppd)
+{
+       /*
+        * The driver does some processing from the time the physical
+        * link state is at LINKUP to the time the SM can be notified
+        * as such. Return IB_PORTPHYSSTATE_TRAINING until the software
+        * state is ready.
+        */
+       if (ppd->pstate == PLS_LINKUP &&
+           !(ppd->host_link_state & HLS_UP))
+               return IB_PORTPHYSSTATE_TRAINING;
+       else
+               return chip_to_opa_pstate(ppd->dd, ppd->pstate);
+}
+
 void receive_interrupt_work(struct work_struct *work);
 
 /* extract service channel from header and rhf */

diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index b180dff5f2e9bca3142a7c0063ae5d0dbf2987f4..c8daf633212db29303a29366996fc2f7be6bad67 100644 (file)
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -113,7 +113,7 @@ static void send_trap(struct hfi1_ibport *ibp, void *data, unsigned len)
                return;
 
        /* o14-3.2.1 */
-       if (ppd_from_ibp(ibp)->lstate != IB_PORT_ACTIVE)
+       if (driver_lstate(ppd_from_ibp(ibp)) != IB_PORT_ACTIVE)
                return;
 
        /* o14-2 */
@@ -615,7 +615,7 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data,
                ppd->offline_disabled_reason;
 
        pi->port_states.portphysstate_portstate =
-               (hfi1_ibphys_portstate(ppd) << 4) | state;
+               (driver_pstate(ppd) << 4) | state;
 
        pi->mkeyprotect_lmc = (ibp->rvp.mkeyprot << 6) | ppd->lmc;
 
@@ -1791,7 +1791,7 @@ static int __subn_get_opa_psi(struct opa_smp *smp, u32 am, u8 *data,
                ppd->offline_disabled_reason;
 
        psi->port_states.portphysstate_portstate =
-               (hfi1_ibphys_portstate(ppd) << 4) | (lstate & 0xf);
+               (driver_pstate(ppd) << 4) | (lstate & 0xf);
        psi->link_width_downgrade_tx_active =
                cpu_to_be16(ppd->link_width_downgrade_tx_active);
        psi->link_width_downgrade_rx_active =

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 2d7759f0c6b48767e506b7acdcf1186fa77b1eb5..5b53faf470424b8eb72c804c597e2aa3babc9042 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1354,7 +1354,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num,
        props->lmc = ppd->lmc;
        /* OPA logical states match IB logical states */
        props->state = driver_lstate(ppd);
-       props->phys_state = hfi1_ibphys_portstate(ppd);
+       props->phys_state = driver_pstate(ppd);
        props->gid_tbl_len = HFI1_GUIDS_PER_PORT;
        props->active_width = (u8)opa_width_to_ib(ppd->link_width_active);
        /* see rate_show() in ib core/sysfs.c */