---

yaml
---
r: 67165
b: refs/heads/master
c: 6a733cd
h: refs/heads/master
i:
  67163: 8db809a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 192594d5230f447ef2df8de9d7902ac90d11c118
+refs/heads/master: 6a733cdc71b7aa8107caa57f2a16629aa731242a

trunk/drivers/infiniband/hw/ipath/ipath_intr.c

@@ -1124,17 +1124,19 @@ 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;
 
 			if (mask & gpiostatus) {
 				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) {