coresight: change coresight_trace_id_map's lock type to raw_spinlock_t

coresight_trace_id_map->lock can be acquired while coresight devices'
drvdata_lock.

But the drvdata_lock can be raw_spinlock_t (i.e) coresight-etm4x.

To address this, change type of coresight_trace_id_map->lock to
raw_spinlock_t

Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20250306121110.1647948-4-yeoreum.yun@arm.com

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index c915a055534e92d8c1032a94dcedd99c1ea622cc..fb43ef6a3b1f0d6d9740e729e7eeb86a5d77ba4a 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -1296,7 +1296,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
 
        if (csdev->type == CORESIGHT_DEV_TYPE_SINK ||
            csdev->type == CORESIGHT_DEV_TYPE_LINKSINK) {
-               spin_lock_init(&csdev->perf_sink_id_map.lock);
+               raw_spin_lock_init(&csdev->perf_sink_id_map.lock);
                csdev->perf_sink_id_map.cpu_map = alloc_percpu(atomic_t);
                if (!csdev->perf_sink_id_map.cpu_map) {
                        kfree(csdev);

diff --git a/drivers/hwtracing/coresight/coresight-trace-id.c b/drivers/hwtracing/coresight/coresight-trace-id.c
index 378af743be4555fe9c8c025b0ce6410af9c28698..7ed337d54d3e3da323ca7fc267dcdbc5d65904a4 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-trace-id.c
+++ b/drivers/hwtracing/coresight/coresight-trace-id.c
@@ -22,7 +22,7 @@ enum trace_id_flags {
 static DEFINE_PER_CPU(atomic_t, id_map_default_cpu_ids) = ATOMIC_INIT(0);
 static struct coresight_trace_id_map id_map_default = {
        .cpu_map = &id_map_default_cpu_ids,
-       .lock = __SPIN_LOCK_UNLOCKED(id_map_default.lock)
+       .lock = __RAW_SPIN_LOCK_UNLOCKED(id_map_default.lock)
 };
 
 /* #define TRACE_ID_DEBUG 1 */
@@ -131,11 +131,11 @@ static void coresight_trace_id_release_all(struct coresight_trace_id_map *id_map
        unsigned long flags;
        int cpu;
 
-       spin_lock_irqsave(&id_map->lock, flags);
+       raw_spin_lock_irqsave(&id_map->lock, flags);
        bitmap_zero(id_map->used_ids, CORESIGHT_TRACE_IDS_MAX);
        for_each_possible_cpu(cpu)
                atomic_set(per_cpu_ptr(id_map->cpu_map, cpu), 0);
-       spin_unlock_irqrestore(&id_map->lock, flags);
+       raw_spin_unlock_irqrestore(&id_map->lock, flags);
        DUMP_ID_MAP(id_map);
 }
 
@@ -144,7 +144,7 @@ static int _coresight_trace_id_get_cpu_id(int cpu, struct coresight_trace_id_map
        unsigned long flags;
        int id;
 
-       spin_lock_irqsave(&id_map->lock, flags);
+       raw_spin_lock_irqsave(&id_map->lock, flags);
 
        /* check for existing allocation for this CPU */
        id = _coresight_trace_id_read_cpu_id(cpu, id_map);
@@ -171,7 +171,7 @@ static int _coresight_trace_id_get_cpu_id(int cpu, struct coresight_trace_id_map
        atomic_set(per_cpu_ptr(id_map->cpu_map, cpu), id);
 
 get_cpu_id_out_unlock:
-       spin_unlock_irqrestore(&id_map->lock, flags);
+       raw_spin_unlock_irqrestore(&id_map->lock, flags);
 
        DUMP_ID_CPU(cpu, id);
        DUMP_ID_MAP(id_map);
@@ -188,12 +188,12 @@ static void _coresight_trace_id_put_cpu_id(int cpu, struct coresight_trace_id_ma
        if (!id)
                return;
 
-       spin_lock_irqsave(&id_map->lock, flags);
+       raw_spin_lock_irqsave(&id_map->lock, flags);
 
        coresight_trace_id_free(id, id_map);
        atomic_set(per_cpu_ptr(id_map->cpu_map, cpu), 0);
 
-       spin_unlock_irqrestore(&id_map->lock, flags);
+       raw_spin_unlock_irqrestore(&id_map->lock, flags);
        DUMP_ID_CPU(cpu, id);
        DUMP_ID_MAP(id_map);
 }
@@ -204,9 +204,9 @@ static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_map *i
        unsigned long flags;
        int id;
 
-       spin_lock_irqsave(&id_map->lock, flags);
+       raw_spin_lock_irqsave(&id_map->lock, flags);
        id = coresight_trace_id_alloc_new_id(id_map, preferred_id, traceid_flags);
-       spin_unlock_irqrestore(&id_map->lock, flags);
+       raw_spin_unlock_irqrestore(&id_map->lock, flags);
 
        DUMP_ID(id);
        DUMP_ID_MAP(id_map);
@@ -217,9 +217,9 @@ static void coresight_trace_id_map_put_system_id(struct coresight_trace_id_map *
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&id_map->lock, flags);
+       raw_spin_lock_irqsave(&id_map->lock, flags);
        coresight_trace_id_free(id, id_map);
-       spin_unlock_irqrestore(&id_map->lock, flags);
+       raw_spin_unlock_irqrestore(&id_map->lock, flags);
 
        DUMP_ID(id);
        DUMP_ID_MAP(id_map);

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 4541bfc1cc6bb30c8f954c4ab1428459446400e2..d79a242b271d6e1ed7021b7c3e156cafb82d2787 100644 (file)
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -239,7 +239,7 @@ struct coresight_trace_id_map {
        DECLARE_BITMAP(used_ids, CORESIGHT_TRACE_IDS_MAX);
        atomic_t __percpu *cpu_map;
        atomic_t perf_cs_etm_session_active;
-       spinlock_t lock;
+       raw_spinlock_t lock;
 };
 
 /**