2 files changed, 10 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 650745d83fac..e1c5998887ea 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1559,6 +1559,14 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
                 ipath_dev_err(dd, "Unsupported InfiniPath serial "
                               "number %.16s!\n", dd->ipath_serial);
 
+        if (dd->ipath_minrev >= 4) {
+                /* Rev4+ reports extra errors via internal GPIO pins */
+                dd->ipath_flags |= IPATH_GPIO_ERRINTRS;
+                dd->ipath_gpio_mask |= IPATH_GPIO_ERRINTR_MASK;
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
+                                 dd->ipath_gpio_mask);
+        }
+
         return 0;
 }
 
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index b29fe7e9b11a..11b361408ae6 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -1085,8 +1085,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;