IB/ipath: Make some constants chip-specific, related cleanup

This patch makes some constants chip-specific, and makes some related
changes to prepare for supporting another HCA.

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

1 files changed, 12 insertions, 21 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 9e2ced3cdc5e..684c27e42406 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -40,6 +40,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/htirq.h>
+#include <rdma/ib_verbs.h>
 
 #include "ipath_kernel.h"
 #include "ipath_registers.h"
@@ -476,7 +477,13 @@ static const struct ipath_hwerror_msgs ipath_6110_hwerror_msgs[] = {
 #define RXE_EAGER_PARITY (INFINIPATH_HWE_RXEMEMPARITYERR_EAGERTID \
                           << INFINIPATH_HWE_RXEMEMPARITYERR_SHIFT)
 
-static int ipath_ht_txe_recover(struct ipath_devdata *);
+static void ipath_ht_txe_recover(struct ipath_devdata *dd)
+{
+        ++ipath_stats.sps_txeparity;
+        dev_info(&dd->pcidev->dev,
+                "Recovering from TXE PIO parity error\n");
+}
+
 
 /**
  * ipath_ht_handle_hwerrors - display hardware errors.
@@ -557,11 +564,11 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg,
                  * occur if a processor speculative read is done to the PIO
                  * buffer while we are sending a packet, for example.
                  */
-                if ((hwerrs & TXE_PIO_PARITY) && ipath_ht_txe_recover(dd))
+                if (hwerrs & TXE_PIO_PARITY) {
+                        ipath_ht_txe_recover(dd);
                         hwerrs &= ~TXE_PIO_PARITY;
-                if (hwerrs & RXE_EAGER_PARITY)
-                        ipath_dev_err(dd, "RXE parity, Eager TID error is not "
-                                "recoverable\n");
+                }
+
                 if (!hwerrs) {
                         ipath_dbg("Clearing freezemode on ignored or "
                                   "recovered hardware error\n");
@@ -1653,22 +1660,6 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
 }
 
 
-static int ipath_ht_txe_recover(struct ipath_devdata *dd)
-{
-        int cnt = ++ipath_stats.sps_txeparity;
-        if (cnt >= IPATH_MAX_PARITY_ATTEMPTS)  {
-                if (cnt == IPATH_MAX_PARITY_ATTEMPTS)
-                        ipath_dev_err(dd,
-                                "Too many attempts to recover from "
-                                "TXE parity, giving up\n");
-                return 0;
-        }
-        dev_info(&dd->pcidev->dev,
-                "Recovering from TXE PIO parity error\n");
-        return 1;
-}
-
-
 /**
  * ipath_init_ht_get_base_info - set chip-specific flags for user code
  * @dd: the infinipath device