diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-11-25 18:46:09 +0000 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2018-07-26 11:25:01 -0700 |
| commit | d4da0e97baea8768b3d66ccef3967bebd50dfc3b (patch) | |
| tree | fcee6b7bc582968132500911e588d75356a6b422 /arch/mips/mm | |
| parent | 5bdd5fbb35ab0fe21bf2263106f51c5bee466a07 (diff) | |
| download | blackbird-obmc-linux-d4da0e97baea8768b3d66ccef3967bebd50dfc3b.tar.gz blackbird-obmc-linux-d4da0e97baea8768b3d66ccef3967bebd50dfc3b.zip | |
MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON
If a driver causes DMA cache maintenance with a zero length then we
currently BUG and kill the kernel. As this is a scenario that we may
well be able to recover from, WARN & return in the condition instead.
Signed-off-by: Paul Burton <paul.burton@mips.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/14623/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Diffstat (limited to 'arch/mips/mm')
| -rw-r--r-- | arch/mips/mm/c-r4k.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 1b4b583fab08..a9ef057c79fe 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -835,7 +835,8 @@ static void r4k_flush_icache_user_range(unsigned long start, unsigned long end) static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size) { /* Catch bad driver code */ - BUG_ON(size == 0); + if (WARN_ON(size == 0)) + return; preempt_disable(); if (cpu_has_inclusive_pcaches) { @@ -871,7 +872,8 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size) static void r4k_dma_cache_inv(unsigned long addr, unsigned long size) { /* Catch bad driver code */ - BUG_ON(size == 0); + if (WARN_ON(size == 0)) + return; preempt_disable(); if (cpu_has_inclusive_pcaches) { |
