coresight: always use stashed trace id value in etm4_trace_id

[mirror_ubuntu-zesty-kernel.git] / drivers / hwtracing / coresight / coresight-etm4x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 462f0dc1575751a01d3778acbbaa30518a1b1dc0..17e2e81d2e908dca15d26149500da65fdbf53485 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -48,6 +48,8 @@ static int etm4_count;
 static struct etmv4_drvdata *etmdrvdata[NR_CPUS];
 static void etm4_set_default(struct etmv4_config *config);
 
+static enum cpuhp_state hp_online;
+
 static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
 {
        /* Writing any value to ETMOSLAR unlocks the trace registers */
@@ -77,22 +79,8 @@ static int etm4_cpu_id(struct coresight_device *csdev)
 static int etm4_trace_id(struct coresight_device *csdev)
 {
        struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-       unsigned long flags;
-       int trace_id = -1;
-
-       if (!local_read(&drvdata->mode))
-               return drvdata->trcid;
-
-       spin_lock_irqsave(&drvdata->spinlock, flags);
-
-       CS_UNLOCK(drvdata->base);
-       trace_id = readl_relaxed(drvdata->base + TRCTRACEIDR);
-       trace_id &= ETM_TRACEID_MASK;
-       CS_LOCK(drvdata->base);
-
-       spin_unlock_irqrestore(&drvdata->spinlock, flags);
 
-       return trace_id;
+       return drvdata->trcid;
 }
 
 static void etm4_enable_hw(void *info)
@@ -673,47 +661,44 @@ void etm4_config_trace_mode(struct etmv4_config *config)
        config->addr_acc[ETM_DEFAULT_ADDR_COMP + 1] = addr_acc;
 }
 
-static int etm4_cpu_callback(struct notifier_block *nfb, unsigned long action,
-                           void *hcpu)
+static int etm4_online_cpu(unsigned int cpu)
 {
-       unsigned int cpu = (unsigned long)hcpu;
-
        if (!etmdrvdata[cpu])
-               goto out;
-
-       switch (action & (~CPU_TASKS_FROZEN)) {
-       case CPU_STARTING:
-               spin_lock(&etmdrvdata[cpu]->spinlock);
-               if (!etmdrvdata[cpu]->os_unlock) {
-                       etm4_os_unlock(etmdrvdata[cpu]);
-                       etmdrvdata[cpu]->os_unlock = true;
-               }
-
-               if (local_read(&etmdrvdata[cpu]->mode))
-                       etm4_enable_hw(etmdrvdata[cpu]);
-               spin_unlock(&etmdrvdata[cpu]->spinlock);
-               break;
+               return 0;
 
-       case CPU_ONLINE:
-               if (etmdrvdata[cpu]->boot_enable &&
-                       !etmdrvdata[cpu]->sticky_enable)
-                       coresight_enable(etmdrvdata[cpu]->csdev);
-               break;
+       if (etmdrvdata[cpu]->boot_enable && !etmdrvdata[cpu]->sticky_enable)
+               coresight_enable(etmdrvdata[cpu]->csdev);
+       return 0;
+}
 
-       case CPU_DYING:
-               spin_lock(&etmdrvdata[cpu]->spinlock);
-               if (local_read(&etmdrvdata[cpu]->mode))
-                       etm4_disable_hw(etmdrvdata[cpu]);
-               spin_unlock(&etmdrvdata[cpu]->spinlock);
-               break;
+static int etm4_starting_cpu(unsigned int cpu)
+{
+       if (!etmdrvdata[cpu])
+               return 0;
+
+       spin_lock(&etmdrvdata[cpu]->spinlock);
+       if (!etmdrvdata[cpu]->os_unlock) {
+               etm4_os_unlock(etmdrvdata[cpu]);
+               etmdrvdata[cpu]->os_unlock = true;
        }
-out:
-       return NOTIFY_OK;
+
+       if (local_read(&etmdrvdata[cpu]->mode))
+               etm4_enable_hw(etmdrvdata[cpu]);
+       spin_unlock(&etmdrvdata[cpu]->spinlock);
+       return 0;
 }
 
-static struct notifier_block etm4_cpu_notifier = {
-       .notifier_call = etm4_cpu_callback,
-};
+static int etm4_dying_cpu(unsigned int cpu)
+{
+       if (!etmdrvdata[cpu])
+               return 0;
+
+       spin_lock(&etmdrvdata[cpu]->spinlock);
+       if (local_read(&etmdrvdata[cpu]->mode))
+               etm4_disable_hw(etmdrvdata[cpu]);
+       spin_unlock(&etmdrvdata[cpu]->spinlock);
+       return 0;
+}
 
 static void etm4_init_trace_id(struct etmv4_drvdata *drvdata)
 {
@@ -767,8 +752,17 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
                                etm4_init_arch_data,  drvdata, 1))
                dev_err(dev, "ETM arch init failed\n");
 
-       if (!etm4_count++)
-               register_hotcpu_notifier(&etm4_cpu_notifier);
+       if (!etm4_count++) {
+               cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING,
+                                         "AP_ARM_CORESIGHT4_STARTING",
+                                         etm4_starting_cpu, etm4_dying_cpu);
+               ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                               "AP_ARM_CORESIGHT4_ONLINE",
+                                               etm4_online_cpu, NULL);
+               if (ret < 0)
+                       goto err_arch_supported;
+               hp_online = ret;
+       }
 
        put_online_cpus();
 
@@ -809,8 +803,11 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
        return 0;
 
 err_arch_supported:
-       if (--etm4_count == 0)
-               unregister_hotcpu_notifier(&etm4_cpu_notifier);
+       if (--etm4_count == 0) {
+               cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING);
+               if (hp_online)
+                       cpuhp_remove_state_nocalls(hp_online);
+       }
        return ret;
 }