Commit c04de7b1 authored by James Hogan's avatar James Hogan Committed by Ralf Baechle

MIPS: CM: Drop WARN_ON(vp != 0)

Since commit 68923cdc ("MIPS: CM: Add cluster & block args to
mips_cm_lock_other()"), mips_smp_send_ipi_mask() has used
mips_cm_lock_other_cpu() with each CPU number, rather than
mips_cm_lock_other() with the first VPE in each core. Prior to r6,
multicore multithreaded systems such as dual-core dual-thread
interAptivs with CPU Idle enabled (e.g. MIPS Creator Ci40) results in
mips_cm_lock_other() repeatedly hitting WARN_ON(vp != 0).

There doesn't appear to be anything fundamentally wrong about passing a
non-zero VP/VPE number, even if it is a core's region that is locked
into the other region before r6, so remove that particular WARN_ON().

Fixes: 68923cdc ("MIPS: CM: Add cluster & block args to mips_cm_lock_other()")
Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
Reviewed-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 4.14+
Patchwork: https://patchwork.linux-mips.org/patch/17883/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b6ab1a13
...@@ -292,7 +292,6 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core, ...@@ -292,7 +292,6 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core,
*this_cpu_ptr(&cm_core_lock_flags)); *this_cpu_ptr(&cm_core_lock_flags));
} else { } else {
WARN_ON(cluster != 0); WARN_ON(cluster != 0);
WARN_ON(vp != 0);
WARN_ON(block != CM_GCR_Cx_OTHER_BLOCK_LOCAL); WARN_ON(block != CM_GCR_Cx_OTHER_BLOCK_LOCAL);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment