diff options
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_intr.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_intr.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c index 26900b3b7a4e..6c21b4b5ec71 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/infiniband/hw/ipath/ipath_intr.c | |||
@@ -356,9 +356,10 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd, | |||
356 | dd->ipath_cregs->cr_iblinkerrrecovcnt); | 356 | dd->ipath_cregs->cr_iblinkerrrecovcnt); |
357 | if (linkrecov != dd->ipath_lastlinkrecov) { | 357 | if (linkrecov != dd->ipath_lastlinkrecov) { |
358 | ipath_dbg("IB linkrecov up %Lx (%s %s) recov %Lu\n", | 358 | ipath_dbg("IB linkrecov up %Lx (%s %s) recov %Lu\n", |
359 | ibcs, ib_linkstate(dd, ibcs), | 359 | (unsigned long long) ibcs, |
360 | ib_linkstate(dd, ibcs), | ||
360 | ipath_ibcstatus_str[ltstate], | 361 | ipath_ibcstatus_str[ltstate], |
361 | linkrecov); | 362 | (unsigned long long) linkrecov); |
362 | /* and no more until active again */ | 363 | /* and no more until active again */ |
363 | dd->ipath_lastlinkrecov = 0; | 364 | dd->ipath_lastlinkrecov = 0; |
364 | ipath_set_linkstate(dd, IPATH_IB_LINKDOWN); | 365 | ipath_set_linkstate(dd, IPATH_IB_LINKDOWN); |
@@ -1118,9 +1119,11 @@ irqreturn_t ipath_intr(int irq, void *data) | |||
1118 | if (unlikely(istat & ~dd->ipath_i_bitsextant)) | 1119 | if (unlikely(istat & ~dd->ipath_i_bitsextant)) |
1119 | ipath_dev_err(dd, | 1120 | ipath_dev_err(dd, |
1120 | "interrupt with unknown interrupts %Lx set\n", | 1121 | "interrupt with unknown interrupts %Lx set\n", |
1122 | (unsigned long long) | ||
1121 | istat & ~dd->ipath_i_bitsextant); | 1123 | istat & ~dd->ipath_i_bitsextant); |
1122 | else if (istat & ~INFINIPATH_I_ERROR) /* errors do own printing */ | 1124 | else if (istat & ~INFINIPATH_I_ERROR) /* errors do own printing */ |
1123 | ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n", istat); | 1125 | ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n", |
1126 | (unsigned long long) istat); | ||
1124 | 1127 | ||
1125 | if (istat & INFINIPATH_I_ERROR) { | 1128 | if (istat & INFINIPATH_I_ERROR) { |
1126 | ipath_stats.sps_errints++; | 1129 | ipath_stats.sps_errints++; |
@@ -1128,7 +1131,8 @@ irqreturn_t ipath_intr(int irq, void *data) | |||
1128 | dd->ipath_kregs->kr_errorstatus); | 1131 | dd->ipath_kregs->kr_errorstatus); |
1129 | if (!estat) | 1132 | if (!estat) |
1130 | dev_info(&dd->pcidev->dev, "error interrupt (%Lx), " | 1133 | dev_info(&dd->pcidev->dev, "error interrupt (%Lx), " |
1131 | "but no error bits set!\n", istat); | 1134 | "but no error bits set!\n", |
1135 | (unsigned long long) istat); | ||
1132 | else if (estat == -1LL) | 1136 | else if (estat == -1LL) |
1133 | /* | 1137 | /* |
1134 | * should we try clearing all, or hope next read | 1138 | * should we try clearing all, or hope next read |