make ls7a dma keep order if CONFIG_LS7A_DMA_KEEP_ORDER.

This reverts commit b0af0089c4. Change-Id: Ib14b33a9078a7cd6295eda1ddfac0b5a830abec6
3 years ago · 1c4736b76f
2 changed files with 2 additions and 1 deletions
--- a/pmon/arch/mips/ls7a/ls7a_define.h
+++ b/pmon/arch/mips/ls7a/ls7a_define.h
@ -43,7 +43,6 @@
 #define TEMP_GMEM_ADDR  0x40000000
 #define LS7A_GMEM_TEMP_ADDR (HT1_MEM_BASE_ADDR | TEMP_GMEM_ADDR)
 //confbus address
-#define CONF_HT_DMA_ORDER	0x414
 #define CONF_HT_CLKEN_OFFSET    0x418
 #define CONF_HT_ROUTE_OFFSET    0x41c
 #define CONF_NB_OFFSET      0x420
--- a/pmon/arch/mips/ls7a/ls7a_init.S
+++ b/pmon/arch/mips/ls7a/ls7a_init.S
@ -5,11 +5,13 @@
 // DO NOT touch this file!

    dli     t0, LS7A_CONFBUS_BASE_ADDR
+#ifdef CONFIG_LS7A_DMA_KEEP_ORDER
    /*0x414: bit 0-18, clear to make each device dma keep order*/
    lw	    t1, CONF_HT_DMA_ORDER(t0)
    li	    t2, ~0x7ffff
    and     t1, t2
    sw	    t1, CONF_HT_DMA_ORDER(t0)
+#endif

    lw      t1, CONF_HT_ROUTE_OFFSET(t0)
    li      t2, (0xf | (0xf << 16))