p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARC: cacheflush refactor #1: push aux reg ascertaining into leaf routine 

ARC dcache supports 3 ops - Inv, Flush, Flush-n-Inv.
The programming model however provides 2 commands FLUSH, INV.
INV will either discard or flush-n-discard (based on DT_CTRL bit)

The leaf helper __dc_line_loop() used to take the AUX register
(corresponding to the 2 commands). Now we push that to within the
helper, paving way for code consolidations to follow.

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
Vineet Gupta 2013-09-05 13:03:35 +05:30
parent 064a626924
commit f3e4de3274
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arc/mm/cache_arc700.c
View File

@ -296,8 +296,10 @@ static inline void __dc_entire_op(const int cacheop)
* (aliasing VIPT dcache flushing needs both vaddr and paddr) * (aliasing VIPT dcache flushing needs both vaddr and paddr)
*/ */
static inline void __dc_line_loop(unsigned long paddr, unsigned long vaddr, static inline void __dc_line_loop(unsigned long paddr, unsigned long vaddr,
unsigned long sz, const int aux_reg) unsigned long sz, const int cacheop)
{ {
/* which MMU cmd: INV (discard or wback-n-discard) OR FLUSH (wback) */
const int aux = cacheop & OP_INV ? ARC_REG_DC_IVDL : ARC_REG_DC_FLDL;
int num_lines; int num_lines;
/* Ensure we properly floor/ceil the non-line aligned/sized requests /* Ensure we properly floor/ceil the non-line aligned/sized requests
@ -326,11 +328,11 @@ static inline void __dc_line_loop(unsigned long paddr, unsigned long vaddr,
*/ */
write_aux_reg(ARC_REG_DC_PTAG, paddr); write_aux_reg(ARC_REG_DC_PTAG, paddr);
write_aux_reg(aux_reg, vaddr); write_aux_reg(aux, vaddr);
vaddr += ARC_DCACHE_LINE_LEN; vaddr += ARC_DCACHE_LINE_LEN;
#else #else
/* paddr contains stuffed vaddrs bits */ /* paddr contains stuffed vaddrs bits */
write_aux_reg(aux_reg, paddr); write_aux_reg(aux, paddr);
#endif #endif
paddr += ARC_DCACHE_LINE_LEN; paddr += ARC_DCACHE_LINE_LEN;
} }
@ -346,7 +348,6 @@ static inline void __dc_line_op(unsigned long paddr, unsigned long vaddr,
unsigned long sz, const int cacheop) unsigned long sz, const int cacheop)
{ {
unsigned long flags, tmp = tmp; unsigned long flags, tmp = tmp;
int aux;
local_irq_save(flags); local_irq_save(flags);
@ -361,12 +362,7 @@ static inline void __dc_line_op(unsigned long paddr, unsigned long vaddr,
write_aux_reg(ARC_REG_DC_CTRL, tmp | DC_CTRL_INV_MODE_FLUSH); write_aux_reg(ARC_REG_DC_CTRL, tmp | DC_CTRL_INV_MODE_FLUSH);
} }
if (cacheop & OP_INV) /* Inv / flush-n-inv use same cmd reg */ __dc_line_loop(paddr, vaddr, sz, cacheop);
aux = ARC_REG_DC_IVDL;
else
aux = ARC_REG_DC_FLDL;
__dc_line_loop(paddr, vaddr, sz, aux);
if (cacheop & OP_FLUSH) /* flush / flush-n-inv both wait */ if (cacheop & OP_FLUSH) /* flush / flush-n-inv both wait */
wait_for_flush(); wait_for_flush();