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
Unified · Split
| @@ -1285,5 +1285,8 @@ · 1284 unmodified lines | |||
| 1285 | #define PCIE_CFG_REG_PL106_GEN3_EQ_PSET_REQ_VEC_SHIFT 8 | 1285 | #define PCIE_CFG_REG_PL106_GEN3_EQ_PSET_REQ_VEC_SHIFT 8 |
| 1286 | #define PCIE_CFG_REG_PL106_GEN3_EQ_EVAL2MS_DISABLE_SMASK 0x20ull | 1286 | #define PCIE_CFG_REG_PL106_GEN3_EQ_EVAL2MS_DISABLE_SMASK 0x20ull |
| 1287 | #define PCIE_CFG_REG_PL106_GEN3_EQ_PHASE23_EXIT_MODE_SMASK 0x10ull | 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 | #endif /* DEF_CHIP_REG */ | 1292 | #endif /* DEF_CHIP_REG */ |
| @@ -1769,7 +1769,7 @@ void sdma_dumpstate(struct sdma_engine *sde) · 1768 unmodified lines | |||
| 1769 | sdma_dumpstate_helper(SD(ENG_ERR_MASK)); | 1769 | sdma_dumpstate_helper(SD(ENG_ERR_MASK)); |
| 1770 | 1770 | ||
| 1771 | for (i = 0; i < CCE_NUM_INT_CSRS; ++i) { | 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 | sdma_dumpstate_helper2(CCE_INT_MASK); | 1773 | sdma_dumpstate_helper2(CCE_INT_MASK); |
| 1774 | sdma_dumpstate_helper2(CCE_INT_BLOCKED); | 1774 | sdma_dumpstate_helper2(CCE_INT_BLOCKED); |
| 1775 | } | 1775 | } |
| @@ -1777,7 +1777,7 @@ void sdma_dumpstate(struct sdma_engine *sde) · 1 unmodified line | |||
| 1777 | sdma_dumpstate_helper(SD(TAIL)); | 1777 | sdma_dumpstate_helper(SD(TAIL)); |
| 1778 | sdma_dumpstate_helper(SD(HEAD)); | 1778 | sdma_dumpstate_helper(SD(HEAD)); |
| 1779 | sdma_dumpstate_helper(SD(PRIORITY_THLD)); | 1779 | sdma_dumpstate_helper(SD(PRIORITY_THLD)); |
| 1780 | sdma_dumpstate_helper(SD(IDLE_CNT); | 1780 | sdma_dumpstate_helper(SD(IDLE_CNT)); |
| 1781 | sdma_dumpstate_helper(SD(RELOAD_CNT)); | 1781 | sdma_dumpstate_helper(SD(RELOAD_CNT)); |
| 1782 | sdma_dumpstate_helper(SD(DESC_CNT)); | 1782 | sdma_dumpstate_helper(SD(DESC_CNT)); |
| 1783 | sdma_dumpstate_helper(SD(DESC_FETCHED_CNT)); | 1783 | sdma_dumpstate_helper(SD(DESC_FETCHED_CNT)); |