These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / hwtracing / coresight / coresight-etm.h

diff --git a/kernel/drivers/hwtracing/coresight/coresight-etm.h b/kernel/drivers/hwtracing/coresight/coresight-etm.h
index 501c5fa..b4481eb 100644 (file)
--- a/kernel/drivers/hwtracing/coresight/coresight-etm.h
+++ b/kernel/drivers/hwtracing/coresight/coresight-etm.h
@@ -140,8 +140,8 @@
  * struct etm_drvdata - specifics associated to an ETM component
  * @base:      memory mapped base address for this component.
  * @dev:       the device entity associated to this component.
+ * @atclk:     optional clock for the core parts of the ETM.
  * @csdev:     component vitals needed by the framework.
- * @clk:       the clock this component is associated to.
  * @spinlock:  only one at a time pls.
  * @cpu:       the cpu this component is affined to.
  * @port_size: port size as reported by ETMCR bit 4-6 and 21.
@@ -183,7 +183,9 @@
  * @seq_13_event: event causing the transition from 1 to 3.
  * @seq_curr_state: current value of the sequencer register.
  * @ctxid_idx: index for the context ID registers.
- * @ctxid_val: value for the context ID to trigger on.
+ * @ctxid_pid: value for the context ID to trigger on.
+ * @ctxid_vpid:        Virtual PID seen by users if PID namespace is enabled, otherwise
+ *             the same value of ctxid_pid.
  * @ctxid_mask: mask applicable to all the context IDs.
  * @sync_freq: Synchronisation frequency.
  * @timestamp_event: Defines an event that requests the insertion
@@ -192,8 +194,8 @@
 struct etm_drvdata {
        void __iomem                    *base;
        struct device                   *dev;
+       struct clk                      *atclk;
        struct coresight_device         *csdev;
-       struct clk                      *clk;
        spinlock_t                      spinlock;
        int                             cpu;
        int                             port_size;
@@ -235,7 +237,8 @@ struct etm_drvdata {
        u32                             seq_13_event;
        u32                             seq_curr_state;
        u8                              ctxid_idx;
-       u32                             ctxid_val[ETM_MAX_CTXID_CMP];
+       u32                             ctxid_pid[ETM_MAX_CTXID_CMP];
+       u32                             ctxid_vpid[ETM_MAX_CTXID_CMP];
        u32                             ctxid_mask;
        u32                             sync_freq;
        u32                             timestamp_event;