aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRalph Campbell <ralph.campbell@qlogic.com>2008-04-17 00:01:14 -0400
committerRoland Dreier <rolandd@cisco.com>2008-04-17 00:01:14 -0400
commitc1702be20fd44f4c878a182be1559c2242916820 (patch)
tree3a227cb0a5327db2ffbbe62f5fe7dd56edd570f4 /drivers/infiniband
parentb84888215310002e3d266d5a7fe458bb224f6881 (diff)
IB/ipath: Don't try to handle freeze mode HW errors if diagnostic mode
Don't try to handle freeze mode HW errors if the driver is in diagnostic mode since some tests can cause errors that shouldn't be processed. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6120.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index f1447be4cfd3..5206b12a7dc0 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -481,7 +481,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
481 (hwerrs & ~dd->ipath_hwe_bitsextant)); 481 (hwerrs & ~dd->ipath_hwe_bitsextant));
482 482
483 ctrl = ipath_read_kreg32(dd, dd->ipath_kregs->kr_control); 483 ctrl = ipath_read_kreg32(dd, dd->ipath_kregs->kr_control);
484 if (ctrl & INFINIPATH_C_FREEZEMODE) { 484 if ((ctrl & INFINIPATH_C_FREEZEMODE) && !ipath_diag_inuse) {
485 /* 485 /*
486 * parity errors in send memory are recoverable, 486 * parity errors in send memory are recoverable,
487 * just cancel the send (if indicated in * sendbuffererror), 487 * just cancel the send (if indicated in * sendbuffererror),