intel_th: Wait until port is in reset before programming it

Some devices don't drain their pipelines if we don't make sure that
the corresponding output port is in reset before programming it for
a new trace capture, resulting in bits of old trace appearing in the
new trace capture. Fix that by explicitly making sure the reset is
asserted before programming new trace capture.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Link: https://lore.kernel.org/r/20210621151246.31891-5-alexander.shishkin@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index 4bf025ef20313339a3d7143f50d72971d3123a7a..66eed2dff81840bce82633624f3aa69162d44e0d 100644 (file)
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -217,6 +217,22 @@ static ssize_t port_show(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR_RO(port);
 
+static void intel_th_trace_prepare(struct intel_th_device *thdev)
+{
+       struct intel_th_device *hub = to_intel_th_hub(thdev);
+       struct intel_th_driver *hubdrv = to_intel_th_driver(hub->dev.driver);
+
+       if (hub->type != INTEL_TH_SWITCH)
+               return;
+
+       if (thdev->type != INTEL_TH_OUTPUT)
+               return;
+
+       pm_runtime_get_sync(&thdev->dev);
+       hubdrv->prepare(hub, &thdev->output);
+       pm_runtime_put(&thdev->dev);
+}
+
 static int intel_th_output_activate(struct intel_th_device *thdev)
 {
        struct intel_th_driver *thdrv =
@@ -237,6 +253,7 @@ static int intel_th_output_activate(struct intel_th_device *thdev)
        if (ret)
                goto fail_put;
 
+       intel_th_trace_prepare(thdev);
        if (thdrv->activate)
                ret = thdrv->activate(thdev);
        else

diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c
index 28509b02a0b563ab81b2229880d57a533fdbf8e3..b3308934a687dfbf8b24af75c620bfa72d5ea028 100644 (file)
--- a/drivers/hwtracing/intel_th/gth.c
+++ b/drivers/hwtracing/intel_th/gth.c
@@ -564,6 +564,21 @@ static void gth_tscu_resync(struct gth_device *gth)
        iowrite32(reg, gth->base + REG_TSCU_TSUCTRL);
 }
 
+static void intel_th_gth_prepare(struct intel_th_device *thdev,
+                                struct intel_th_output *output)
+{
+       struct gth_device *gth = dev_get_drvdata(&thdev->dev);
+       int count;
+
+       /*
+        * Wait until the output port is in reset before we start
+        * programming it.
+        */
+       for (count = GTH_PLE_WAITLOOP_DEPTH;
+            count && !(gth_output_get(gth, output->port) & BIT(5)); count--)
+               cpu_relax();
+}
+
 /**
  * intel_th_gth_enable() - enable tracing to an output device
  * @thdev:     GTH device
@@ -815,6 +830,7 @@ static struct intel_th_driver intel_th_gth_driver = {
        .assign         = intel_th_gth_assign,
        .unassign       = intel_th_gth_unassign,
        .set_output     = intel_th_gth_set_output,
+       .prepare        = intel_th_gth_prepare,
        .enable         = intel_th_gth_enable,
        .trig_switch    = intel_th_gth_switch,
        .disable        = intel_th_gth_disable,

diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
index 89c67e0e1d348e7184fcbe18df676ca4e2d97bf9..0ffb42990175adb0bfb9c9d4d1e0dba846556fe0 100644 (file)
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -143,6 +143,7 @@ intel_th_output_assigned(struct intel_th_device *thdev)
  * @remove:    remove method
  * @assign:    match a given output type device against available outputs
  * @unassign:  deassociate an output type device from an output port
+ * @prepare:   prepare output port for tracing
  * @enable:    enable tracing for a given output device
  * @disable:   disable tracing for a given output device
  * @irq:       interrupt callback
@@ -164,6 +165,8 @@ struct intel_th_driver {
                                          struct intel_th_device *othdev);
        void                    (*unassign)(struct intel_th_device *thdev,
                                            struct intel_th_device *othdev);
+       void                    (*prepare)(struct intel_th_device *thdev,
+                                          struct intel_th_output *output);
        void                    (*enable)(struct intel_th_device *thdev,
                                          struct intel_th_output *output);
        void                    (*trig_switch)(struct intel_th_device *thdev,