1 files changed, 37 insertions, 31 deletions

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index c265e0468414..d828a6efe0b1 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -40,6 +40,7 @@ enum coresight_dev_type {
         CORESIGHT_DEV_TYPE_LINK,
         CORESIGHT_DEV_TYPE_LINKSINK,
         CORESIGHT_DEV_TYPE_SOURCE,
+        CORESIGHT_DEV_TYPE_HELPER,
 };
 
 enum coresight_dev_subtype_sink {
@@ -62,19 +63,30 @@ enum coresight_dev_subtype_source {
         CORESIGHT_DEV_SUBTYPE_SOURCE_SOFTWARE,
 };
 
+enum coresight_dev_subtype_helper {
+        CORESIGHT_DEV_SUBTYPE_HELPER_NONE,
+        CORESIGHT_DEV_SUBTYPE_HELPER_CATU,
+};
+
 /**
- * struct coresight_dev_subtype - further characterisation of a type
+ * union coresight_dev_subtype - further characterisation of a type
  * @sink_subtype:       type of sink this component is, as defined
-                        by @coresight_dev_subtype_sink.
+ *                      by @coresight_dev_subtype_sink.
  * @link_subtype:       type of link this component is, as defined
-                        by @coresight_dev_subtype_link.
+ *                      by @coresight_dev_subtype_link.
  * @source_subtype:     type of source this component is, as defined
-                        by @coresight_dev_subtype_source.
+ *                      by @coresight_dev_subtype_source.
+ * @helper_subtype:     type of helper this component is, as defined
+ *                      by @coresight_dev_subtype_helper.
  */
-struct coresight_dev_subtype {
-        enum coresight_dev_subtype_sink sink_subtype;
-        enum coresight_dev_subtype_link link_subtype;
+union coresight_dev_subtype {
+        /* We have some devices which acts as LINK and SINK */
+        struct {
+                enum coresight_dev_subtype_sink sink_subtype;
+                enum coresight_dev_subtype_link link_subtype;
+        };
         enum coresight_dev_subtype_source source_subtype;
+        enum coresight_dev_subtype_helper helper_subtype;
 };
 
 /**
@@ -87,7 +99,6 @@ struct coresight_dev_subtype {
  * @child_ports:child component port number the current component is
                 connected  to.
  * @nr_outport: number of output ports for this component.
- * @clk:        The clock this component is associated to.
  */
 struct coresight_platform_data {
         int cpu;
@@ -97,7 +108,6 @@ struct coresight_platform_data {
         const char **child_names;
         int *child_ports;
         int nr_outport;
-        struct clk *clk;
 };
 
 /**
@@ -113,7 +123,7 @@ struct coresight_platform_data {
  */
 struct coresight_desc {
         enum coresight_dev_type type;
-        struct coresight_dev_subtype subtype;
+        union coresight_dev_subtype subtype;
         const struct coresight_ops *ops;
         struct coresight_platform_data *pdata;
         struct device *dev;
@@ -157,7 +167,7 @@ struct coresight_device {
         int nr_inport;
         int nr_outport;
         enum coresight_dev_type type;
-        struct coresight_dev_subtype subtype;
+        union coresight_dev_subtype subtype;
         const struct coresight_ops *ops;
         struct device dev;
         atomic_t *refcnt;
@@ -171,6 +181,7 @@ struct coresight_device {
 #define source_ops(csdev)       csdev->ops->source_ops
 #define sink_ops(csdev)         csdev->ops->sink_ops
 #define link_ops(csdev)         csdev->ops->link_ops
+#define helper_ops(csdev)       csdev->ops->helper_ops
 
 /**
  * struct coresight_ops_sink - basic operations for a sink
@@ -230,10 +241,25 @@ struct coresight_ops_source {
                         struct perf_event *event);
 };
 
+/**
+ * struct coresight_ops_helper - Operations for a helper device.
+ *
+ * All operations could pass in a device specific data, which could
+ * help the helper device to determine what to do.
+ *
+ * @enable      : Enable the device
+ * @disable     : Disable the device
+ */
+struct coresight_ops_helper {
+        int (*enable)(struct coresight_device *csdev, void *data);
+        int (*disable)(struct coresight_device *csdev, void *data);
+};
+
 struct coresight_ops {
         const struct coresight_ops_sink *sink_ops;
         const struct coresight_ops_link *link_ops;
         const struct coresight_ops_source *source_ops;
+        const struct coresight_ops_helper *helper_ops;
 };
 
 #ifdef CONFIG_CORESIGHT
@@ -267,24 +293,4 @@ static inline struct coresight_platform_data *of_get_coresight_platform_data(
         struct device *dev, const struct device_node *node) { return NULL; }
 #endif
 
-#ifdef CONFIG_PID_NS
-static inline unsigned long
-coresight_vpid_to_pid(unsigned long vpid)
-{
-        struct task_struct *task = NULL;
-        unsigned long pid = 0;
-
-        rcu_read_lock();
-        task = find_task_by_vpid(vpid);
-        if (task)
-                pid = task_pid_nr(task);
-        rcu_read_unlock();
-
-        return pid;
-}
-#else
-static inline unsigned long
-coresight_vpid_to_pid(unsigned long vpid) { return vpid; }
-#endif
-
 #endif