From: Ralph Campbell Date: Thu, 17 Apr 2008 04:01:14 +0000 (-0700) Subject: IB/ipath: Don't try to handle freeze mode HW errors if diagnostic mode X-Git-Tag: v2.6.26-rc1~1156^2~64 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c1702be20fd44f4c878a182be1559c2242916820;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Roland Dreier --- diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c index f1447be4cfd..5206b12a7dc 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, (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),