2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index 59a8b254b97f..0bd8bcb184a1 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -232,6 +232,11 @@ struct ipath_sdma_desc {
 #define IPATH_SDMA_TXREQ_S_ABORTED   2
 #define IPATH_SDMA_TXREQ_S_SHUTDOWN  3
 
+#define IPATH_SDMA_STATUS_SCORE_BOARD_DRAIN_IN_PROG     (1ull << 63)
+#define IPATH_SDMA_STATUS_ABORT_IN_PROG                 (1ull << 62)
+#define IPATH_SDMA_STATUS_INTERNAL_SDMA_ENABLE          (1ull << 61)
+#define IPATH_SDMA_STATUS_SCB_EMPTY                     (1ull << 30)
+
 /* max dwords in small buffer packet */
 #define IPATH_SMALLBUF_DWORDS (dd->ipath_piosize2k >> 2)
 
diff --git a/drivers/infiniband/hw/ipath/ipath_sdma.c b/drivers/infiniband/hw/ipath/ipath_sdma.c
index 0a8c1b8091a2..eaba03273e4f 100644
--- a/drivers/infiniband/hw/ipath/ipath_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_sdma.c
@@ -263,14 +263,10 @@ static void sdma_abort_task(unsigned long opaque)
                 hwstatus = ipath_read_kreg64(dd,
                                 dd->ipath_kregs->kr_senddmastatus);
 
-                if (/* ScoreBoardDrainInProg */
-                    test_bit(63, &hwstatus) ||
-                    /* AbortInProg */
-                    test_bit(62, &hwstatus) ||
-                    /* InternalSDmaEnable */
-                    test_bit(61, &hwstatus) ||
-                    /* ScbEmpty */
-                    !test_bit(30, &hwstatus)) {
+                if ((hwstatus & (IPATH_SDMA_STATUS_SCORE_BOARD_DRAIN_IN_PROG |
+                                 IPATH_SDMA_STATUS_ABORT_IN_PROG             |
+                                 IPATH_SDMA_STATUS_INTERNAL_SDMA_ENABLE)) ||
+                    !(hwstatus & IPATH_SDMA_STATUS_SCB_EMPTY)) {
                         if (dd->ipath_sdma_reset_wait > 0) {
                                 /* not done shutting down sdma */
                                 --dd->ipath_sdma_reset_wait;