]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
IB/ipath: Don't try to handle freeze mode HW errors if diagnostic mode
authorRalph Campbell <ralph.campbell@qlogic.com>
Thu, 17 Apr 2008 04:01:14 +0000 (21:01 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 17 Apr 2008 04:01:14 +0000 (21:01 -0700)
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>
drivers/infiniband/hw/ipath/ipath_iba6120.c

index f1447be4cfd32e0f12545a379bb3fda7c17154f9..5206b12a7dc0f091fcbf4a44301498f881786cc2 100644 (file)
@@ -481,7 +481,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
                              (hwerrs & ~dd->ipath_hwe_bitsextant));
 
        ctrl = ipath_read_kreg32(dd, dd->ipath_kregs->kr_control);
-       if (ctrl & INFINIPATH_C_FREEZEMODE) {
+       if ((ctrl & INFINIPATH_C_FREEZEMODE) && !ipath_diag_inuse) {
                /*
                 * parity errors in send memory are recoverable,
                 * just cancel the send (if indicated in * sendbuffererror),