4.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Brodkin <abrodkin@xxxxxxxxxxxx> commit c70c473396cbdec1168a6eff60e13029c0916854 upstream. As reported in STAR 9001165532, an SLC control reg read (for checking busy state) right after SLC invalidate command may incorrectly return NOT busy causing software to NOT spin-wait while operation is underway. (and for some reason this only happens if L1 cache is also disabled - as required by IOC programming model) Suggested workaround is to do an additional Control Reg read, which ensures the 2nd read gets the right status. Signed-off-by: Alexey Brodkin <abrodkin@xxxxxxxxxxxx> [vgupta: reworte changelog a bit] Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/arc/mm/cache.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arc/mm/cache.c +++ b/arch/arc/mm/cache.c @@ -633,6 +633,9 @@ noinline static void slc_entire_op(const write_aux_reg(ARC_REG_SLC_INVALIDATE, 1); + /* Make sure "busy" bit reports correct stataus, see STAR 9001165532 */ + read_aux_reg(r); + /* Important to wait for flush to complete */ while (read_aux_reg(r) & SLC_CTRL_BUSY); }