1 files changed, 35 insertions, 29 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index b29fe7e9b1..6a5dd5cd77 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -275,6 +275,16 @@ static char *ib_linkstate(u32 linkstate)
         return ret;
 }
 
+void signal_ib_event(struct ipath_devdata *dd, enum ib_event_type ev)
+{
+        struct ib_event event;
+
+        event.device = &dd->verbs_dev->ibdev;
+        event.element.port_num = 1;
+        event.event = ev;
+        ib_dispatch_event(&event);
+}
+
 static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
                                      ipath_err_t errs, int noprint)
 {
@@ -373,6 +383,8 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
         dd->ipath_ibpollcnt = 0;        /* some state other than 2 or 3 */
         ipath_stats.sps_iblink++;
         if (ltstate != INFINIPATH_IBCS_LT_STATE_LINKUP) {
+                if (dd->ipath_flags & IPATH_LINKACTIVE)
+                        signal_ib_event(dd, IB_EVENT_PORT_ERR);
                 dd->ipath_flags |= IPATH_LINKDOWN;
                 dd->ipath_flags &= ~(IPATH_LINKUNK | IPATH_LINKINIT
                                      | IPATH_LINKACTIVE |
@@ -405,7 +417,10 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
                 *dd->ipath_statusp |=
                         IPATH_STATUS_IB_READY | IPATH_STATUS_IB_CONF;
                 dd->ipath_f_setextled(dd, lstate, ltstate);
+                signal_ib_event(dd, IB_EVENT_PORT_ACTIVE);
         } else if ((val & IPATH_IBSTATE_MASK) == IPATH_IBSTATE_INIT) {
+                if (dd->ipath_flags & IPATH_LINKACTIVE)
+                        signal_ib_event(dd, IB_EVENT_PORT_ERR);
                 /*
                  * set INIT and DOWN.  Down is checked by most of the other
                  * code, but INIT is useful to know in a few places.
@@ -418,6 +433,8 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
                                         | IPATH_STATUS_IB_READY);
                 dd->ipath_f_setextled(dd, lstate, ltstate);
         } else if ((val & IPATH_IBSTATE_MASK) == IPATH_IBSTATE_ARM) {
+                if (dd->ipath_flags & IPATH_LINKACTIVE)
+                        signal_ib_event(dd, IB_EVENT_PORT_ERR);
                 dd->ipath_flags |= IPATH_LINKARMED;
                 dd->ipath_flags &=
                         ~(IPATH_LINKUNK | IPATH_LINKDOWN | IPATH_LINKINIT |
@@ -688,17 +705,9 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
                                         chkerrpkts = 1;
                                 dd->ipath_lastrcvhdrqtails[i] = tl;
                                 pd->port_hdrqfull++;
-                                if (test_bit(IPATH_PORT_WAITING_OVERFLOW,
-                                             &pd->port_flag)) {
-                                        clear_bit(
-                                          IPATH_PORT_WAITING_OVERFLOW,
-                                          &pd->port_flag);
-                                        set_bit(
-                                          IPATH_PORT_WAITING_OVERFLOW,
-                                          &pd->int_flag);
-                                        wake_up_interruptible(
-                                          &pd->port_wait);
-                                }
+                                /* flush hdrqfull so that poll() sees it */
+                                wmb();
+                                wake_up_interruptible(&pd->port_wait);
                         }
                 }
         }
@@ -960,6 +969,8 @@ static void handle_urcv(struct ipath_devdata *dd, u32 istat)
         int i;
         int rcvdint = 0;
 
+        /* test_bit below needs this... */
+        rmb();
         portr = ((istat >> INFINIPATH_I_RCVAVAIL_SHIFT) &
                  dd->ipath_i_rcvavail_mask)
                 | ((istat >> INFINIPATH_I_RCVURG_SHIFT) &
@@ -967,22 +978,15 @@ static void handle_urcv(struct ipath_devdata *dd, u32 istat)
         for (i = 1; i < dd->ipath_cfgports; i++) {
                 struct ipath_portdata *pd = dd->ipath_pd[i];
                 if (portr & (1 << i) && pd && pd->port_cnt) {
-                        if (test_bit(IPATH_PORT_WAITING_RCV,
-                                     &pd->port_flag)) {
-                                clear_bit(IPATH_PORT_WAITING_RCV,
-                                          &pd->port_flag);
-                                set_bit(IPATH_PORT_WAITING_RCV,
-                                        &pd->int_flag);
+                        if (test_and_clear_bit(IPATH_PORT_WAITING_RCV,
+                                               &pd->port_flag)) {
                                 clear_bit(i + INFINIPATH_R_INTRAVAIL_SHIFT,
                                           &dd->ipath_rcvctrl);
                                 wake_up_interruptible(&pd->port_wait);
                                 rcvdint = 1;
-                        } else if (test_bit(IPATH_PORT_WAITING_URG,
-                                            &pd->port_flag)) {
-                                clear_bit(IPATH_PORT_WAITING_URG,
-                                          &pd->port_flag);
-                                set_bit(IPATH_PORT_WAITING_URG,
-                                        &pd->int_flag);
+                        } else if (test_and_clear_bit(IPATH_PORT_WAITING_URG,
+                                                      &pd->port_flag)) {
+                                pd->port_urgent++;
                                 wake_up_interruptible(&pd->port_wait);
                         }
                 }
@@ -1085,8 +1089,8 @@ irqreturn_t ipath_intr(int irq, void *data)
                  * GPIO_2 indicates (on some HT4xx boards) that a packet
                  *        has arrived for Port 0. Checking for this
                  *        is controlled by flag IPATH_GPIO_INTR.
-                 * GPIO_3..5 on IBA6120 Rev2 chips indicate errors
-                 *        that we need to count. Checking for this
+                 * GPIO_3..5 on IBA6120 Rev2 and IBA6110 Rev4 chips indicate
+                 *        errors that we need to count. Checking for this
                  *        is controlled by flag IPATH_GPIO_ERRINTRS.
                  */
                 u32 gpiostatus;
@@ -1137,10 +1141,8 @@ irqreturn_t ipath_intr(int irq, void *data)
                         /*
                          * Some unexpected bits remain. If they could have
                          * caused the interrupt, complain and clear.
-                         * MEA: this is almost certainly non-ideal.
-                         * we should look into auto-disable of unexpected
-                         * GPIO interrupts, possibly on a "three strikes"
-                         * basis.
+                         * To avoid repetition of this condition, also clear
+                         * the mask. It is almost certainly due to error.
                          */
                         const u32 mask = (u32) dd->ipath_gpio_mask;
 
@@ -1148,6 +1150,10 @@ irqreturn_t ipath_intr(int irq, void *data)
                                 ipath_dbg("Unexpected GPIO IRQ bits %x\n",
                                   gpiostatus & mask);
                                 to_clear |= (gpiostatus & mask);
+                                dd->ipath_gpio_mask &= ~(gpiostatus & mask);
+                                ipath_write_kreg(dd,
+                                        dd->ipath_kregs->kr_gpio_mask,
+                                        dd->ipath_gpio_mask);
                         }
                 }
                 if (to_clear) {