Commit d6219420 authored by Matt Redfearn's avatar Matt Redfearn Committed by Ralf Baechle

MIPS: CPC: Avoid lock when MIPS CM >= 3 is present

MIPS CM version 3 removed the CPC_CL_OTHER register and instead the
CM_CL_OTHER register is used to redirect the CPC_OTHER region. As such,
we should not write the unimplmented register and can avoid the
spinlock as well.
These lock functions should aleady be called within the context of a
mips_cm_{lock,unlock}_other pair ensuring the correct CPC_OTHER region
will be accessed.
Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14219/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6b89d22e
...@@ -71,6 +71,11 @@ int mips_cpc_probe(void) ...@@ -71,6 +71,11 @@ int mips_cpc_probe(void)
void mips_cpc_lock_other(unsigned int core) void mips_cpc_lock_other(unsigned int core)
{ {
unsigned int curr_core; unsigned int curr_core;
if (mips_cm_revision() >= CM_REV_CM3)
/* Systems with CM >= 3 lock the CPC via mips_cm_lock_other */
return;
preempt_disable(); preempt_disable();
curr_core = current_cpu_data.core; curr_core = current_cpu_data.core;
spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core), spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core),
...@@ -86,7 +91,13 @@ void mips_cpc_lock_other(unsigned int core) ...@@ -86,7 +91,13 @@ void mips_cpc_lock_other(unsigned int core)
void mips_cpc_unlock_other(void) void mips_cpc_unlock_other(void)
{ {
unsigned int curr_core = current_cpu_data.core; unsigned int curr_core;
if (mips_cm_revision() >= CM_REV_CM3)
/* Systems with CM >= 3 lock the CPC via mips_cm_lock_other */
return;
curr_core = current_cpu_data.core;
spin_unlock_irqrestore(&per_cpu(cpc_core_lock, curr_core), spin_unlock_irqrestore(&per_cpu(cpc_core_lock, curr_core),
per_cpu(cpc_core_lock_flags, curr_core)); per_cpu(cpc_core_lock_flags, curr_core));
preempt_enable(); preempt_enable();
......
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