IB/ipath: Add code to support multiple link speeds and widths

This patch adds code to get/set portinfo to support multiple link speeds
and widths.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index caee731b670f1e510b7a3f06610aaf4b3962df02..960d5b7e7865303cc1f36d6cdabfc0816127067b 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -801,6 +801,8 @@ void ipath_hol_event(unsigned long);
 /*
  * values for ipath_flags
  */
+               /* chip can report link latency (IB 1.2) */
+#define IPATH_HAS_LINK_LATENCY 0x1
 /* The chip is up and initted */
 #define IPATH_INITTED       0x2
                /* set if any user code has set kr_rcvhdrsize */

diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index aca876bae1c4f1dcbf9f8d78b90a84d24291380e..7516a26089882b83c473fb4d696d09c34e640247 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -146,6 +146,15 @@ static int recv_subn_get_guidinfo(struct ib_smp *smp,
        return reply(smp);
 }
 
+static void set_link_width_enabled(struct ipath_devdata *dd, u32 w)
+{
+       (void) dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_LWID_ENB, w);
+}
+
+static void set_link_speed_enabled(struct ipath_devdata *dd, u32 s)
+{
+       (void) dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_SPD_ENB, s);
+}
 
 static int get_overrunthreshold(struct ipath_devdata *dd)
 {
@@ -226,6 +235,7 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,
                                  struct ib_device *ibdev, u8 port)
 {
        struct ipath_ibdev *dev;
+       struct ipath_devdata *dd;
        struct ib_port_info *pip = (struct ib_port_info *)smp->data;
        u16 lid;
        u8 ibcstat;
@@ -239,6 +249,7 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,
        }
 
        dev = to_idev(ibdev);
+       dd = dev->dd;
 
        /* Clear all fields.  Only set the non-zero fields. */
        memset(smp->data, 0, sizeof(smp->data));
@@ -248,25 +259,28 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,
            dev->mkeyprot == 0)
                pip->mkey = dev->mkey;
        pip->gid_prefix = dev->gid_prefix;
-       lid = dev->dd->ipath_lid;
+       lid = dd->ipath_lid;
        pip->lid = lid ? cpu_to_be16(lid) : IB_LID_PERMISSIVE;
        pip->sm_lid = cpu_to_be16(dev->sm_lid);
        pip->cap_mask = cpu_to_be32(dev->port_cap_flags);
        /* pip->diag_code; */
        pip->mkey_lease_period = cpu_to_be16(dev->mkey_lease_period);
        pip->local_port_num = port;
-       pip->link_width_enabled = dev->link_width_enabled;
-       pip->link_width_supported = 3;  /* 1x or 4x */
-       pip->link_width_active = 2;     /* 4x */
-       pip->linkspeed_portstate = 0x10;        /* 2.5Gbps */
-       ibcstat = dev->dd->ipath_lastibcstat;
-       pip->linkspeed_portstate |= ((ibcstat >> 4) & 0x3) + 1;
+       pip->link_width_enabled = dd->ipath_link_width_enabled;
+       pip->link_width_supported = dd->ipath_link_width_supported;
+       pip->link_width_active = dd->ipath_link_width_active;
+       pip->linkspeed_portstate = dd->ipath_link_speed_supported << 4;
+       ibcstat = dd->ipath_lastibcstat;
+       /* map LinkState to IB portinfo values.  */
+       pip->linkspeed_portstate |= ipath_ib_linkstate(dd, ibcstat) + 1;
+
        pip->portphysstate_linkdown =
-               (ipath_cvt_physportstate[ibcstat & 0xf] << 4) |
-               (get_linkdowndefaultstate(dev->dd) ? 1 : 2);
-       pip->mkeyprot_resv_lmc = (dev->mkeyprot << 6) | dev->dd->ipath_lmc;
-       pip->linkspeedactive_enabled = 0x11;    /* 2.5Gbps, 2.5Gbps */
-       switch (dev->dd->ipath_ibmtu) {
+               (ipath_cvt_physportstate[ibcstat & dd->ibcs_lts_mask] << 4) |
+               (get_linkdowndefaultstate(dd) ? 1 : 2);
+       pip->mkeyprot_resv_lmc = (dev->mkeyprot << 6) | dd->ipath_lmc;
+       pip->linkspeedactive_enabled = (dd->ipath_link_speed_active << 4) |
+               dd->ipath_link_speed_enabled;
+       switch (dd->ipath_ibmtu) {
        case 4096:
                mtu = IB_MTU_4096;
                break;
@@ -300,7 +314,7 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,
        pip->mkey_violations = cpu_to_be16(dev->mkey_violations);
        /* P_KeyViolations are counted by hardware. */
        pip->pkey_violations =
-               cpu_to_be16((ipath_get_cr_errpkey(dev->dd) -
+               cpu_to_be16((ipath_get_cr_errpkey(dd) -
                             dev->z_pkey_violations) & 0xFFFF);
        pip->qkey_violations = cpu_to_be16(dev->qkey_violations);
        /* Only the hardware GUID is supported for now */
@@ -309,10 +323,17 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,
        /* 32.768 usec. response time (guessing) */
        pip->resv_resptimevalue = 3;
        pip->localphyerrors_overrunerrors =
-               (get_phyerrthreshold(dev->dd) << 4) |
-               get_overrunthreshold(dev->dd);
+               (get_phyerrthreshold(dd) << 4) |
+               get_overrunthreshold(dd);
        /* pip->max_credit_hint; */
-       /* pip->link_roundtrip_latency[3]; */
+       if (dev->port_cap_flags & IB_PORT_LINK_LATENCY_SUP) {
+               u32 v;
+
+               v = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_LINKLATENCY);
+               pip->link_roundtrip_latency[0] = v >> 16;
+               pip->link_roundtrip_latency[1] = v >> 8;
+               pip->link_roundtrip_latency[2] = v;
+       }
 
        ret = reply(smp);
 
@@ -440,19 +461,25 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,
                ib_dispatch_event(&event);
        }
 
-       /* Only 4x supported but allow 1x or 4x to be set (see 14.2.6.6). */
+       /* Allow 1x or 4x to be set (see 14.2.6.6). */
        lwe = pip->link_width_enabled;
-       if ((lwe >= 4 && lwe <= 8) || (lwe >= 0xC && lwe <= 0xFE))
-               goto err;
-       if (lwe == 0xFF)
-               dev->link_width_enabled = 3;    /* 1x or 4x */
-       else if (lwe)
-               dev->link_width_enabled = lwe;
+       if (lwe) {
+               if (lwe == 0xFF)
+                       lwe = dd->ipath_link_width_supported;
+               else if (lwe >= 16 || (lwe & ~dd->ipath_link_width_supported))
+                       goto err;
+               set_link_width_enabled(dd, lwe);
+       }
 
-       /* Only 2.5 Gbs supported. */
+       /* Allow 2.5 or 5.0 Gbs. */
        lse = pip->linkspeedactive_enabled & 0xF;
-       if (lse >= 2 && lse <= 0xE)
-               goto err;
+       if (lse) {
+               if (lse == 15)
+                       lse = dd->ipath_link_speed_supported;
+               else if (lse >= 8 || (lse & ~dd->ipath_link_speed_supported))
+                       goto err;
+               set_link_speed_enabled(dd, lse);
+       }
 
        /* Set link down default state. */
        switch (pip->portphysstate_linkdown & 0xF) {
@@ -946,10 +973,14 @@ static int recv_pma_get_portsamplescontrol(struct ib_perf *pmp,
         * nsec.  0 == 4 nsec., 1 == 8 nsec., ..., 255 == 1020 nsec.  Sample
         * intervals are counted in ticks.  Since we use Linux timers, that
         * count in jiffies, we can't sample for less than 1000 ticks if HZ
-        * == 1000 (4000 ticks if HZ is 250).
+        * == 1000 (4000 ticks if HZ is 250).  link_speed_active returns 2 for
+        * DDR, 1 for SDR, set the tick to 1 for DDR, 0 for SDR on chips that
+        * have hardware support for delaying packets.
         */
-       /* XXX This is WRONG. */
-       p->tick = 250;          /* 1 usec. */
+       if (crp->cr_psstat)
+               p->tick = dev->dd->ipath_link_speed_active - 1;
+       else
+               p->tick = 250;          /* 1 usec. */
        p->counter_width = 4;   /* 32 bit counters */
        p->counter_mask0_9 = COUNTER_MASK0_9;
        spin_lock_irqsave(&dev->pending_lock, flags);

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 012ccb4f9a379cc90d438f6d35cfa7ba00135481..2f9bc29313afde8e89501d22ea1f8199a0fa048c 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1183,7 +1183,9 @@ static int ipath_query_port(struct ib_device *ibdev,
        props->sm_lid = dev->sm_lid;
        props->sm_sl = dev->sm_sl;
        ibcstat = dd->ipath_lastibcstat;
-       props->state = ((ibcstat >> 4) & 0x3) + 1;
+       /* map LinkState to IB portinfo values.  */
+       props->state = ipath_ib_linkstate(dd, ibcstat) + 1;
+
        /* See phys_state_show() */
        props->phys_state = /* MEA: assumes shift == 0 */
                ipath_cvt_physportstate[dd->ipath_lastibcstat &
@@ -1195,9 +1197,9 @@ static int ipath_query_port(struct ib_device *ibdev,
        props->bad_pkey_cntr = ipath_get_cr_errpkey(dd) -
                dev->z_pkey_violations;
        props->qkey_viol_cntr = dev->qkey_violations;
-       props->active_width = IB_WIDTH_4X;
+       props->active_width = dd->ipath_link_width_active;
        /* See rate_show() */
-       props->active_speed = 1;        /* Regular 10Mbs speed. */
+       props->active_speed = dd->ipath_link_speed_active;
        props->max_vl_num = 1;          /* VLCap = VL0 */
        props->init_type_reply = 0;
 
@@ -1629,12 +1631,13 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
        idev->pending_index = 0;
        idev->port_cap_flags =
                IB_PORT_SYS_IMAGE_GUID_SUP | IB_PORT_CLIENT_REG_SUP;
+       if (dd->ipath_flags & IPATH_HAS_LINK_LATENCY)
+               idev->port_cap_flags |= IB_PORT_LINK_LATENCY_SUP;
        idev->pma_counter_select[0] = IB_PMA_PORT_XMIT_DATA;
        idev->pma_counter_select[1] = IB_PMA_PORT_RCV_DATA;
        idev->pma_counter_select[2] = IB_PMA_PORT_XMIT_PKTS;
        idev->pma_counter_select[3] = IB_PMA_PORT_RCV_PKTS;
        idev->pma_counter_select[4] = IB_PMA_PORT_XMIT_WAIT;
-       idev->link_width_enabled = 3;   /* 1x or 4x */
 
        /* Snapshot current HW counters to "clear" them. */
        ipath_get_counters(dd, &cntrs);