IB/hfi1: Add CSRs for CONFIG_SDMA_VERBOSITY

3 CSRs needed by the CONFIG_SDMA_VERBOSITY code were removed during
the CSR clean up. Adding these CSRs back to resolve 0-day build failure:
https://lists.01.org/pipermail/kbuild-all/2015-August/011919.html

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/chip_registers.h b/drivers/staging/rdma/hfi1/chip_registers.h
index 6521030018d856b2821c7a5be0b6c585cce57ca1..bf45de29d8bd759ec8677f553659994001d951ea 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip_registers.h
+++ b/drivers/staging/rdma/hfi1/chip_registers.h
@@ -1285,5 +1285,8 @@
 #define PCIE_CFG_REG_PL106_GEN3_EQ_PSET_REQ_VEC_SHIFT 8
 #define PCIE_CFG_REG_PL106_GEN3_EQ_EVAL2MS_DISABLE_SMASK 0x20ull
 #define PCIE_CFG_REG_PL106_GEN3_EQ_PHASE23_EXIT_MODE_SMASK 0x10ull
+#define CCE_INT_BLOCKED (CCE + 0x000000110C00)
+#define SEND_DMA_IDLE_CNT (TXE + 0x000000200040)
+#define SEND_DMA_DESC_FETCHED_CNT (TXE + 0x000000200058)
 
 #endif          /* DEF_CHIP_REG */

diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index 37bd767d6bc01dce4de2e1c0afb370f39381bf8d..a8c903caecce0ce4b3d15edfa29cddf351becd33 100644 (file)
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -1769,7 +1769,7 @@ void sdma_dumpstate(struct sdma_engine *sde)
        sdma_dumpstate_helper(SD(ENG_ERR_MASK));
 
        for (i = 0; i < CCE_NUM_INT_CSRS; ++i) {
-               sdma_dumpstate_helper2(CCE_INT_STATUS));
+               sdma_dumpstate_helper2(CCE_INT_STATUS);
                sdma_dumpstate_helper2(CCE_INT_MASK);
                sdma_dumpstate_helper2(CCE_INT_BLOCKED);
        }
@@ -1777,7 +1777,7 @@ void sdma_dumpstate(struct sdma_engine *sde)
        sdma_dumpstate_helper(SD(TAIL));
        sdma_dumpstate_helper(SD(HEAD));
        sdma_dumpstate_helper(SD(PRIORITY_THLD));
-       sdma_dumpstate_helper(SD(IDLE_CNT);
+       sdma_dumpstate_helper(SD(IDLE_CNT));
        sdma_dumpstate_helper(SD(RELOAD_CNT));
        sdma_dumpstate_helper(SD(DESC_CNT));
        sdma_dumpstate_helper(SD(DESC_FETCHED_CNT));