[PATCH v3 1/7] mips: {cm,cpc}: Make cm_core_lock, cpc_core_lock raw spinlocks

From: Vladimir Kondratiev

Date: Thu Nov 19 2026 - 12:53:35 EST


From: Paul Burton <paul.burton@xxxxxxxx>

cm_core_lock and cpc_core_lock are used to protect access to a CPU's
core-other/redirect CM and CPC register blocks. Since each CPU sees
its own copy of this block, we need to ensure that critical sections
holding a cm_core_lock run on one CPU - ie. we need to disable
preemption.

Use raw_spinlock_t to implement cm_core_lock and cpc_core_lock in
order to provide the guarantees we need on PREEMPT_RT systems.

Signed-off-by: Paul Burton <paul.burton@xxxxxxxx>
[added CPC part]
Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@xxxxxxxxxxxx>
---
arch/mips/kernel/mips-cm.c | 20 ++++++++++----------
arch/mips/kernel/mips-cpc.c | 12 ++++++------
2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index 7c9c5dc38823..3bfe85e86a9a 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -179,7 +179,7 @@ static char *cm3_causes[32] = {
"0x19", "0x1a", "0x1b", "0x1c", "0x1d", "0x1e", "0x1f"
};

-static DEFINE_PER_CPU_ALIGNED(spinlock_t, cm_core_lock);
+static DEFINE_PER_CPU_ALIGNED(raw_spinlock_t, cm_core_lock);
static DEFINE_PER_CPU_ALIGNED(unsigned long, cm_core_lock_flags);

phys_addr_t __weak mips_cm_phys_base(void)
@@ -309,7 +309,7 @@ int mips_cm_probe(void)
mips_cm_is64 = IS_ENABLED(CONFIG_64BIT) && (mips_cm_revision() >= CM_REV_CM3);

for_each_possible_cpu(cpu)
- spin_lock_init(&per_cpu(cm_core_lock, cpu));
+ raw_spin_lock_init(&per_cpu(cm_core_lock, cpu));

return 0;
}
@@ -347,8 +347,8 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core,
* mips_cm_lock_other() leading to a deadlock or a nice warning
* with lockdep enabled.
*/
- spin_lock_irqsave(this_cpu_ptr(&cm_core_lock),
- *this_cpu_ptr(&cm_core_lock_flags));
+ raw_spin_lock_irqsave(this_cpu_ptr(&cm_core_lock),
+ *this_cpu_ptr(&cm_core_lock_flags));
} else {
WARN_ON(cluster != 0);
WARN_ON(block != CM_GCR_Cx_OTHER_BLOCK_LOCAL);
@@ -359,8 +359,8 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core,
* race with us.
*/
curr_core = cpu_core(&current_cpu_data);
- spin_lock_irqsave(&per_cpu(cm_core_lock, curr_core),
- per_cpu(cm_core_lock_flags, curr_core));
+ raw_spin_lock_irqsave(&per_cpu(cm_core_lock, curr_core),
+ per_cpu(cm_core_lock_flags, curr_core));

val = FIELD_PREP(CM_GCR_Cx_OTHER_CORENUM, core);
}
@@ -380,11 +380,11 @@ void mips_cm_unlock_other(void)

if (mips_cm_revision() < CM_REV_CM3) {
curr_core = cpu_core(&current_cpu_data);
- spin_unlock_irqrestore(&per_cpu(cm_core_lock, curr_core),
- per_cpu(cm_core_lock_flags, curr_core));
+ raw_spin_unlock_irqrestore(&per_cpu(cm_core_lock, curr_core),
+ per_cpu(cm_core_lock_flags, curr_core));
} else {
- spin_unlock_irqrestore(this_cpu_ptr(&cm_core_lock),
- *this_cpu_ptr(&cm_core_lock_flags));
+ raw_spin_unlock_irqrestore(this_cpu_ptr(&cm_core_lock),
+ *this_cpu_ptr(&cm_core_lock_flags));
}

preempt_enable();
diff --git a/arch/mips/kernel/mips-cpc.c b/arch/mips/kernel/mips-cpc.c
index 3e386f7e1545..4b50c58628dc 100644
--- a/arch/mips/kernel/mips-cpc.c
+++ b/arch/mips/kernel/mips-cpc.c
@@ -15,7 +15,7 @@

void __iomem *mips_cpc_base;

-static DEFINE_PER_CPU_ALIGNED(spinlock_t, cpc_core_lock);
+static DEFINE_PER_CPU_ALIGNED(raw_spinlock_t, cpc_core_lock);

static DEFINE_PER_CPU_ALIGNED(unsigned long, cpc_core_lock_flags);

@@ -74,7 +74,7 @@ int mips_cpc_probe(void)
unsigned int cpu;

for_each_possible_cpu(cpu)
- spin_lock_init(&per_cpu(cpc_core_lock, cpu));
+ raw_spin_lock_init(&per_cpu(cpc_core_lock, cpu));

addr = mips_cpc_phys_base();
if (!addr)
@@ -97,8 +97,8 @@ void mips_cpc_lock_other(unsigned int core)

preempt_disable();
curr_core = cpu_core(&current_cpu_data);
- spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core),
- per_cpu(cpc_core_lock_flags, curr_core));
+ raw_spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core),
+ per_cpu(cpc_core_lock_flags, curr_core));
write_cpc_cl_other(FIELD_PREP(CPC_Cx_OTHER_CORENUM, core));

/*
@@ -117,7 +117,7 @@ void mips_cpc_unlock_other(void)
return;

curr_core = cpu_core(&current_cpu_data);
- spin_unlock_irqrestore(&per_cpu(cpc_core_lock, curr_core),
- per_cpu(cpc_core_lock_flags, curr_core));
+ raw_spin_unlock_irqrestore(&per_cpu(cpc_core_lock, curr_core),
+ per_cpu(cpc_core_lock_flags, curr_core));
preempt_enable();
}

--
2.43.0