IB/hfi1: Add CSRs for CONFIG_SDMA_VERBOSITY

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Jubin John and committed by

Doug Ledford 10 years ago 6fd8edab b636401f

+5 -2

2 changed files

expand all

drivers

staging

rdma

hfi1

chip_registers.h

sdma.c

drivers/staging/rdma/hfi1/chip_registers.h

··· 1285 1285 #define PCIE_CFG_REG_PL106_GEN3_EQ_PSET_REQ_VEC_SHIFT 8 1286 1286 #define PCIE_CFG_REG_PL106_GEN3_EQ_EVAL2MS_DISABLE_SMASK 0x20ull 1287 1287 #define PCIE_CFG_REG_PL106_GEN3_EQ_PHASE23_EXIT_MODE_SMASK 0x10ull 1288 + #define CCE_INT_BLOCKED (CCE + 0x000000110C00) 1289 + #define SEND_DMA_IDLE_CNT (TXE + 0x000000200040) 1290 + #define SEND_DMA_DESC_FETCHED_CNT (TXE + 0x000000200058) 1288 1291 1289 1292 #endif /* DEF_CHIP_REG */

+2 -2

drivers/staging/rdma/hfi1/sdma.c

··· 1769 1769 sdma_dumpstate_helper(SD(ENG_ERR_MASK)); 1770 1770 1771 1771 for (i = 0; i < CCE_NUM_INT_CSRS; ++i) { 1772 - sdma_dumpstate_helper2(CCE_INT_STATUS)); 1772 + sdma_dumpstate_helper2(CCE_INT_STATUS); 1773 1773 sdma_dumpstate_helper2(CCE_INT_MASK); 1774 1774 sdma_dumpstate_helper2(CCE_INT_BLOCKED); 1775 1775 } ··· 1777 1777 sdma_dumpstate_helper(SD(TAIL)); 1778 1778 sdma_dumpstate_helper(SD(HEAD)); 1779 1779 sdma_dumpstate_helper(SD(PRIORITY_THLD)); 1780 - sdma_dumpstate_helper(SD(IDLE_CNT); 1780 + sdma_dumpstate_helper(SD(IDLE_CNT)); 1781 1781 sdma_dumpstate_helper(SD(RELOAD_CNT)); 1782 1782 sdma_dumpstate_helper(SD(DESC_CNT)); 1783 1783 sdma_dumpstate_helper(SD(DESC_FETCHED_CNT));