IB/ipath: Change use of constants for TID type to defined values

Define pkt rcvd 'type' in a way consistent with HW spec and chips.

The hardware considers received packets of type 0 to be expected, and
type 1 to be eager. The driver was calling the ipath_f_put_tid
functions using a variable called 'type' set to 0 for eager and to 1
for expected packets.  Worse, the iba6110 and iba6120 drivers used
those values inconsistently.  This was quite confusing.  Now
everything is consistent with the hardware.

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 04799852ec7e..d8ac9f18bf49 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1408,7 +1408,7 @@ static void ipath_ht_quiet_serdes(struct ipath_devdata *dd)
  * ipath_pe_put_tid - write a TID in chip
  * @dd: the infinipath device
  * @tidptr: pointer to the expected TID (in chip) to udpate
- * @tidtype: 0 for eager, 1 for expected
+ * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected
  * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing
  *
  * This exists as a separate routine to allow for special locking etc.
@@ -1429,7 +1429,7 @@ static void ipath_ht_put_tid(struct ipath_devdata *dd,
                                  "40 bits, using only 40!!!\n", pa);
                         pa &= INFINIPATH_RT_ADDR_MASK;
                 }
-                if (type == 0)
+                if (type == RCVHQ_RCV_TYPE_EAGER)
                         pa |= dd->ipath_tidtemplate;
                 else {
                         /* in words (fixed, full page).  */
@@ -1469,7 +1469,8 @@ static void ipath_ht_clear_tids(struct ipath_devdata *dd, unsigned port)
                                    port * dd->ipath_rcvtidcnt *
                                    sizeof(*tidbase));
         for (i = 0; i < dd->ipath_rcvtidcnt; i++)
-                ipath_ht_put_tid(dd, &tidbase[i], 1, dd->ipath_tidinvalid);
+                ipath_ht_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EXPECTED,
+                                 dd->ipath_tidinvalid);
 
         tidbase = (u64 __iomem *) ((char __iomem *)(dd->ipath_kregbase) +
                                    dd->ipath_rcvegrbase +
@@ -1477,7 +1478,8 @@ static void ipath_ht_clear_tids(struct ipath_devdata *dd, unsigned port)
                                    sizeof(*tidbase));
 
         for (i = 0; i < dd->ipath_rcvegrcnt; i++)
-                ipath_ht_put_tid(dd, &tidbase[i], 0, dd->ipath_tidinvalid);
+                ipath_ht_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EAGER,
+                                 dd->ipath_tidinvalid);
 }
 
 /**