IB/ipath: Misc changes to prepare for IB7220 introduction

The patch adds a number of minor changes to support newer HCAs:
 - New send buffer control bits
 - New error condition bits
 - Locking and initialization changes
 - More send buffers

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

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 3bad601fcc90..90b972f6a840 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -73,7 +73,7 @@ static void ipath_clrpiobuf(struct ipath_devdata *dd, u32 pnum)
  * If rewrite is true, and bits are set in the sendbufferror registers,
  * we'll write to the buffer, for error recovery on parity errors.
  */
-static void ipath_disarm_senderrbufs(struct ipath_devdata *dd, int rewrite)
+void ipath_disarm_senderrbufs(struct ipath_devdata *dd, int rewrite)
 {
         u32 piobcnt;
         unsigned long sbuf[4];
@@ -87,12 +87,14 @@ static void ipath_disarm_senderrbufs(struct ipath_devdata *dd, int rewrite)
                 dd, dd->ipath_kregs->kr_sendbuffererror);
         sbuf[1] = ipath_read_kreg64(
                 dd, dd->ipath_kregs->kr_sendbuffererror + 1);
-        if (piobcnt > 128) {
+        if (piobcnt > 128)
                 sbuf[2] = ipath_read_kreg64(
                         dd, dd->ipath_kregs->kr_sendbuffererror + 2);
+        if (piobcnt > 192)
                 sbuf[3] = ipath_read_kreg64(
                         dd, dd->ipath_kregs->kr_sendbuffererror + 3);
-        }
+        else
+                sbuf[3] = 0;
 
         if (sbuf[0] || sbuf[1] || (piobcnt > 128 && (sbuf[2] || sbuf[3]))) {
                 int i;
@@ -365,7 +367,8 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
                  */
                 if (lastlts == INFINIPATH_IBCS_LT_STATE_POLLACTIVE ||
                     lastlts == INFINIPATH_IBCS_LT_STATE_POLLQUIET) {
-                        if (++dd->ipath_ibpollcnt == 40) {
+                        if (!(dd->ipath_flags & IPATH_IB_AUTONEG_INPROG) &&
+                             (++dd->ipath_ibpollcnt == 40)) {
                                 dd->ipath_flags |= IPATH_NOCABLE;
                                 *dd->ipath_statusp |=
                                         IPATH_STATUS_IB_NOCABLE;