diff options
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba7220.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_iba7220.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c index 7dec89fdc124..22affda8af88 100644 --- a/drivers/infiniband/hw/qib/qib_iba7220.c +++ b/drivers/infiniband/hw/qib/qib_iba7220.c | |||
@@ -902,7 +902,8 @@ static void sdma_7220_errors(struct qib_pportdata *ppd, u64 errs) | |||
902 | errs &= QLOGIC_IB_E_SDMAERRS; | 902 | errs &= QLOGIC_IB_E_SDMAERRS; |
903 | 903 | ||
904 | msg = dd->cspec->sdmamsgbuf; | 904 | msg = dd->cspec->sdmamsgbuf; |
905 | qib_decode_7220_sdma_errs(ppd, errs, msg, sizeof dd->cspec->sdmamsgbuf); | 905 | qib_decode_7220_sdma_errs(ppd, errs, msg, |
906 | sizeof(dd->cspec->sdmamsgbuf)); | ||
906 | spin_lock_irqsave(&ppd->sdma_lock, flags); | 907 | spin_lock_irqsave(&ppd->sdma_lock, flags); |
907 | 908 | ||
908 | if (errs & ERR_MASK(SendBufMisuseErr)) { | 909 | if (errs & ERR_MASK(SendBufMisuseErr)) { |
@@ -1043,6 +1044,7 @@ done: | |||
1043 | static void reenable_7220_chase(unsigned long opaque) | 1044 | static void reenable_7220_chase(unsigned long opaque) |
1044 | { | 1045 | { |
1045 | struct qib_pportdata *ppd = (struct qib_pportdata *)opaque; | 1046 | struct qib_pportdata *ppd = (struct qib_pportdata *)opaque; |
1047 | |||
1046 | ppd->cpspec->chase_timer.expires = 0; | 1048 | ppd->cpspec->chase_timer.expires = 0; |
1047 | qib_set_ib_7220_lstate(ppd, QLOGIC_IB_IBCC_LINKCMD_DOWN, | 1049 | qib_set_ib_7220_lstate(ppd, QLOGIC_IB_IBCC_LINKCMD_DOWN, |
1048 | QLOGIC_IB_IBCC_LINKINITCMD_POLL); | 1050 | QLOGIC_IB_IBCC_LINKINITCMD_POLL); |
@@ -1101,7 +1103,7 @@ static void handle_7220_errors(struct qib_devdata *dd, u64 errs) | |||
1101 | 1103 | ||
1102 | /* do these first, they are most important */ | 1104 | /* do these first, they are most important */ |
1103 | if (errs & ERR_MASK(HardwareErr)) | 1105 | if (errs & ERR_MASK(HardwareErr)) |
1104 | qib_7220_handle_hwerrors(dd, msg, sizeof dd->cspec->emsgbuf); | 1106 | qib_7220_handle_hwerrors(dd, msg, sizeof(dd->cspec->emsgbuf)); |
1105 | else | 1107 | else |
1106 | for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) | 1108 | for (log_idx = 0; log_idx < QIB_EEP_LOG_CNT; ++log_idx) |
1107 | if (errs & dd->eep_st_masks[log_idx].errs_to_log) | 1109 | if (errs & dd->eep_st_masks[log_idx].errs_to_log) |
@@ -1155,7 +1157,7 @@ static void handle_7220_errors(struct qib_devdata *dd, u64 errs) | |||
1155 | ERR_MASK(RcvEgrFullErr) | ERR_MASK(RcvHdrFullErr) | | 1157 | ERR_MASK(RcvEgrFullErr) | ERR_MASK(RcvHdrFullErr) | |
1156 | ERR_MASK(HardwareErr) | ERR_MASK(SDmaDisabledErr); | 1158 | ERR_MASK(HardwareErr) | ERR_MASK(SDmaDisabledErr); |
1157 | 1159 | ||
1158 | qib_decode_7220_err(dd, msg, sizeof dd->cspec->emsgbuf, errs & ~mask); | 1160 | qib_decode_7220_err(dd, msg, sizeof(dd->cspec->emsgbuf), errs & ~mask); |
1159 | 1161 | ||
1160 | if (errs & E_SUM_PKTERRS) | 1162 | if (errs & E_SUM_PKTERRS) |
1161 | qib_stats.sps_rcverrs++; | 1163 | qib_stats.sps_rcverrs++; |
@@ -1380,7 +1382,7 @@ static void qib_7220_handle_hwerrors(struct qib_devdata *dd, char *msg, | |||
1380 | bits = (u32) ((hwerrs >> | 1382 | bits = (u32) ((hwerrs >> |
1381 | QLOGIC_IB_HWE_PCIEMEMPARITYERR_SHIFT) & | 1383 | QLOGIC_IB_HWE_PCIEMEMPARITYERR_SHIFT) & |
1382 | QLOGIC_IB_HWE_PCIEMEMPARITYERR_MASK); | 1384 | QLOGIC_IB_HWE_PCIEMEMPARITYERR_MASK); |
1383 | snprintf(bitsmsg, sizeof dd->cspec->bitsmsgbuf, | 1385 | snprintf(bitsmsg, sizeof(dd->cspec->bitsmsgbuf), |
1384 | "[PCIe Mem Parity Errs %x] ", bits); | 1386 | "[PCIe Mem Parity Errs %x] ", bits); |
1385 | strlcat(msg, bitsmsg, msgl); | 1387 | strlcat(msg, bitsmsg, msgl); |
1386 | } | 1388 | } |
@@ -1390,7 +1392,7 @@ static void qib_7220_handle_hwerrors(struct qib_devdata *dd, char *msg, | |||
1390 | 1392 | ||
1391 | if (hwerrs & _QIB_PLL_FAIL) { | 1393 | if (hwerrs & _QIB_PLL_FAIL) { |
1392 | isfatal = 1; | 1394 | isfatal = 1; |
1393 | snprintf(bitsmsg, sizeof dd->cspec->bitsmsgbuf, | 1395 | snprintf(bitsmsg, sizeof(dd->cspec->bitsmsgbuf), |
1394 | "[PLL failed (%llx), InfiniPath hardware unusable]", | 1396 | "[PLL failed (%llx), InfiniPath hardware unusable]", |
1395 | (unsigned long long) hwerrs & _QIB_PLL_FAIL); | 1397 | (unsigned long long) hwerrs & _QIB_PLL_FAIL); |
1396 | strlcat(msg, bitsmsg, msgl); | 1398 | strlcat(msg, bitsmsg, msgl); |
@@ -3297,8 +3299,6 @@ static void qib_get_7220_faststats(unsigned long opaque) | |||
3297 | spin_lock_irqsave(&dd->eep_st_lock, flags); | 3299 | spin_lock_irqsave(&dd->eep_st_lock, flags); |
3298 | traffic_wds -= dd->traffic_wds; | 3300 | traffic_wds -= dd->traffic_wds; |
3299 | dd->traffic_wds += traffic_wds; | 3301 | dd->traffic_wds += traffic_wds; |
3300 | if (traffic_wds >= QIB_TRAFFIC_ACTIVE_THRESHOLD) | ||
3301 | atomic_add(5, &dd->active_time); /* S/B #define */ | ||
3302 | spin_unlock_irqrestore(&dd->eep_st_lock, flags); | 3302 | spin_unlock_irqrestore(&dd->eep_st_lock, flags); |
3303 | done: | 3303 | done: |
3304 | mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER); | 3304 | mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER); |