Coresight: Change functions to accept the coresight_path

Jie Gan · Suzuki K Poulose · commit 080ee83cc361 · 2025-03-04T18:06:18.000Z
Modify following functions to accept the coresight_path. Devices in the path can read data from coresight_path if needed. - coresight_enable_path - coresight_disable_path - coresight_get_source - coresight_get_sink - coresight_enable_helpers - coresight_disable_helpers Signed-off-by: Jie Gan <quic_jiegan@quicinc.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20250303032931.2500935-8-quic_jiegan@quicinc.com
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
@@ -77,14 +77,14 @@ struct coresight_device *coresight_get_percpu_sink(int cpu)
 }
 EXPORT_SYMBOL_GPL(coresight_get_percpu_sink);
 
-static struct coresight_device *coresight_get_source(struct list_head *path)
+static struct coresight_device *coresight_get_source(struct coresight_path *path)
 {
 	struct coresight_device *csdev;
 
 	if (!path)
 		return NULL;
 
-	csdev = list_first_entry(path, struct coresight_node, link)->csdev;
+	csdev = list_first_entry(&path->path_list, struct coresight_node, link)->csdev;
 	if (!coresight_is_device_source(csdev))
 		return NULL;
 
@@ -333,20 +333,20 @@ static int coresight_enable_helper(struct coresight_device *csdev,
 	return helper_ops(csdev)->enable(csdev, mode, data);
 }
 
-static void coresight_disable_helper(struct coresight_device *csdev)
+static void coresight_disable_helper(struct coresight_device *csdev, void *data)
 {
-	helper_ops(csdev)->disable(csdev, NULL);
+	helper_ops(csdev)->disable(csdev, data);
 }
 
-static void coresight_disable_helpers(struct coresight_device *csdev)
+static void coresight_disable_helpers(struct coresight_device *csdev, void *data)
 {
 	int i;
 	struct coresight_device *helper;
 
 	for (i = 0; i < csdev->pdata->nr_outconns; ++i) {
 		helper = csdev->pdata->out_conns[i]->dest_dev;
 		if (helper && coresight_is_helper(helper))
-			coresight_disable_helper(helper);
+			coresight_disable_helper(helper, data);
 	}
 }
 
@@ -363,7 +363,7 @@ static void coresight_disable_helpers(struct coresight_device *csdev)
 void coresight_disable_source(struct coresight_device *csdev, void *data)
 {
 	source_ops(csdev)->disable(csdev, data);
-	coresight_disable_helpers(csdev);
+	coresight_disable_helpers(csdev, NULL);
 }
 EXPORT_SYMBOL_GPL(coresight_disable_source);
 
@@ -372,16 +372,16 @@ EXPORT_SYMBOL_GPL(coresight_disable_source);
  * @nd in the list. If @nd is NULL, all the components, except the SOURCE are
  * disabled.
  */
-static void coresight_disable_path_from(struct list_head *path,
+static void coresight_disable_path_from(struct coresight_path *path,
 					struct coresight_node *nd)
 {
 	u32 type;
 	struct coresight_device *csdev, *parent, *child;
 
 	if (!nd)
-		nd = list_first_entry(path, struct coresight_node, link);
+		nd = list_first_entry(&path->path_list, struct coresight_node, link);
 
-	list_for_each_entry_continue(nd, path, link) {
+	list_for_each_entry_continue(nd, &path->path_list, link) {
 		csdev = nd->csdev;
 		type = csdev->type;
 
@@ -419,11 +419,11 @@ static void coresight_disable_path_from(struct list_head *path,
 		}
 
 		/* Disable all helpers adjacent along the path last */
-		coresight_disable_helpers(csdev);
+		coresight_disable_helpers(csdev, path);
 	}
 }
 
-void coresight_disable_path(struct list_head *path)
+void coresight_disable_path(struct coresight_path *path)
 {
 	coresight_disable_path_from(path, NULL);
 }
@@ -448,7 +448,7 @@ static int coresight_enable_helpers(struct coresight_device *csdev,
 	return 0;
 }
 
-int coresight_enable_path(struct list_head *path, enum cs_mode mode,
+int coresight_enable_path(struct coresight_path *path, enum cs_mode mode,
 			  void *sink_data)
 {
 	int ret = 0;
@@ -458,12 +458,12 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
 	struct coresight_device *source;
 
 	source = coresight_get_source(path);
-	list_for_each_entry_reverse(nd, path, link) {
+	list_for_each_entry_reverse(nd, &path->path_list, link) {
 		csdev = nd->csdev;
 		type = csdev->type;
 
 		/* Enable all helpers adjacent to the path first */
-		ret = coresight_enable_helpers(csdev, mode, sink_data);
+		ret = coresight_enable_helpers(csdev, mode, path);
 		if (ret)
 			goto err;
 		/*
@@ -511,20 +511,21 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
 	goto out;
 }
 
-struct coresight_device *coresight_get_sink(struct list_head *path)
+struct coresight_device *coresight_get_sink(struct coresight_path *path)
 {
 	struct coresight_device *csdev;
 
 	if (!path)
 		return NULL;
 
-	csdev = list_last_entry(path, struct coresight_node, link)->csdev;
+	csdev = list_last_entry(&path->path_list, struct coresight_node, link)->csdev;
 	if (csdev->type != CORESIGHT_DEV_TYPE_SINK &&
 	    csdev->type != CORESIGHT_DEV_TYPE_LINKSINK)
 		return NULL;
 
 	return csdev;
 }
+EXPORT_SYMBOL_GPL(coresight_get_sink);
 
 u32 coresight_get_sink_id(struct coresight_device *csdev)
 {
@@ -680,7 +681,7 @@ static int coresight_get_trace_id(struct coresight_device *csdev,
 void coresight_path_assign_trace_id(struct coresight_path *path,
 				    enum cs_mode mode)
 {
-	struct coresight_device *sink = coresight_get_sink(&path->path_list);
+	struct coresight_device *sink = coresight_get_sink(path);
 	struct coresight_node *nd;
 	int trace_id;
 
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -197,7 +197,6 @@ static void free_sink_buffer(struct etm_event_data *event_data)
 	int cpu;
 	cpumask_t *mask = &event_data->mask;
 	struct coresight_device *sink;
-	struct coresight_path *path;
 
 	if (!event_data->snk_config)
 		return;
@@ -206,8 +205,7 @@ static void free_sink_buffer(struct etm_event_data *event_data)
 		return;
 
 	cpu = cpumask_first(mask);
-	path = etm_event_cpu_path(event_data, cpu);
-	sink = coresight_get_sink(&path->path_list);
+	sink = coresight_get_sink(etm_event_cpu_path(event_data, cpu));
 	sink_ops(sink)->free_buffer(event_data->snk_config);
 }
 
@@ -232,7 +230,7 @@ static void free_event_data(struct work_struct *work)
 
 		ppath = etm_event_cpu_path_ptr(event_data, cpu);
 		if (!(IS_ERR_OR_NULL(*ppath))) {
-			struct coresight_device *sink = coresight_get_sink(&((*ppath)->path_list));
+			struct coresight_device *sink = coresight_get_sink(*ppath);
 
 			/*
 			 * Mark perf event as done for trace id allocator, but don't call
@@ -494,12 +492,12 @@ static void etm_event_start(struct perf_event *event, int flags)
 
 	path = etm_event_cpu_path(event_data, cpu);
 	/* We need a sink, no need to continue without one */
-	sink = coresight_get_sink(&path->path_list);
+	sink = coresight_get_sink(path);
 	if (WARN_ON_ONCE(!sink))
 		goto fail_end_stop;
 
 	/* Nothing will happen without a path */
-	if (coresight_enable_path(&path->path_list, CS_MODE_PERF, handle))
+	if (coresight_enable_path(path, CS_MODE_PERF, handle))
 		goto fail_end_stop;
 
 	/* Finally enable the tracer */
@@ -531,7 +529,7 @@ static void etm_event_start(struct perf_event *event, int flags)
 	return;
 
 fail_disable_path:
-	coresight_disable_path(&path->path_list);
+	coresight_disable_path(path);
 fail_end_stop:
 	/*
 	 * Check if the handle is still associated with the event,
@@ -596,7 +594,7 @@ static void etm_event_stop(struct perf_event *event, int mode)
 	if (!path)
 		return;
 
-	sink = coresight_get_sink(&path->path_list);
+	sink = coresight_get_sink(path);
 	if (!sink)
 		return;
 
@@ -640,7 +638,7 @@ static void etm_event_stop(struct perf_event *event, int mode)
 	}
 
 	/* Disabling the path make its elements available to other sessions */
-	coresight_disable_path(&path->path_list);
+	coresight_disable_path(path);
 }
 
 static int etm_event_add(struct perf_event *event, int mode)
diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h
@@ -132,10 +132,10 @@ static inline void CS_UNLOCK(void __iomem *addr)
 	} while (0);
 }
 
-void coresight_disable_path(struct list_head *path);
-int coresight_enable_path(struct list_head *path, enum cs_mode mode,
+void coresight_disable_path(struct coresight_path *path);
+int coresight_enable_path(struct coresight_path *path, enum cs_mode mode,
 			  void *sink_data);
-struct coresight_device *coresight_get_sink(struct list_head *path);
+struct coresight_device *coresight_get_sink(struct coresight_path *path);
 struct coresight_device *coresight_get_sink_by_id(u32 id);
 struct coresight_device *
 coresight_find_default_sink(struct coresight_device *csdev);
diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtracing/coresight/coresight-sysfs.c
@@ -214,7 +214,7 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
 	if (!IS_VALID_CS_TRACE_ID(path->trace_id))
 		goto err_path;
 
-	ret = coresight_enable_path(&path->path_list, CS_MODE_SYSFS, NULL);
+	ret = coresight_enable_path(path, CS_MODE_SYSFS, NULL);
 	if (ret)
 		goto err_path;
 
@@ -256,7 +256,7 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
 	return ret;
 
 err_source:
-	coresight_disable_path(&path->path_list);
+	coresight_disable_path(path);
 
 err_path:
 	coresight_release_path(path);
@@ -302,7 +302,7 @@ void coresight_disable_sysfs(struct coresight_device *csdev)
 		break;
 	}
 
-	coresight_disable_path(&path->path_list);
+	coresight_disable_path(path);
 	coresight_release_path(path);
 
 out:

Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,14 @@ struct coresight_device *coresight_get_percpu_sink(int cpu)`
`77`	`77`	`}`
`78`	`78`	`EXPORT_SYMBOL_GPL(coresight_get_percpu_sink);`
`79`	`79`
`80`		`-static struct coresight_device coresight_get_source(struct list_head path)`
	`80`	`+static struct coresight_device coresight_get_source(struct coresight_path path)`
`81`	`81`	`{`
`82`	`82`	`struct coresight_device *csdev;`
`83`	`83`
`84`	`84`	`if (!path)`
`85`	`85`	`return NULL;`
`86`	`86`
`87`		`- csdev = list_first_entry(path, struct coresight_node, link)->csdev;`
	`87`	`+ csdev = list_first_entry(&path->path_list, struct coresight_node, link)->csdev;`
`88`	`88`	`if (!coresight_is_device_source(csdev))`
`89`	`89`	`return NULL;`
`90`	`90`
`@@ -333,20 +333,20 @@ static int coresight_enable_helper(struct coresight_device *csdev,`
`333`	`333`	`return helper_ops(csdev)->enable(csdev, mode, data);`
`334`	`334`	`}`
`335`	`335`
`336`		`-static void coresight_disable_helper(struct coresight_device *csdev)`
	`336`	`+static void coresight_disable_helper(struct coresight_device csdev, void data)`
`337`	`337`	`{`
`338`		`- helper_ops(csdev)->disable(csdev, NULL);`
	`338`	`+ helper_ops(csdev)->disable(csdev, data);`
`339`	`339`	`}`
`340`	`340`
`341`		`-static void coresight_disable_helpers(struct coresight_device *csdev)`
	`341`	`+static void coresight_disable_helpers(struct coresight_device csdev, void data)`
`342`	`342`	`{`
`343`	`343`	`int i;`
`344`	`344`	`struct coresight_device *helper;`
`345`	`345`
`346`	`346`	`for (i = 0; i < csdev->pdata->nr_outconns; ++i) {`
`347`	`347`	`helper = csdev->pdata->out_conns[i]->dest_dev;`
`348`	`348`	`if (helper && coresight_is_helper(helper))`
`349`		`- coresight_disable_helper(helper);`
	`349`	`+ coresight_disable_helper(helper, data);`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`
`@@ -363,7 +363,7 @@ static void coresight_disable_helpers(struct coresight_device *csdev)`
`363`	`363`	`void coresight_disable_source(struct coresight_device csdev, void data)`
`364`	`364`	`{`
`365`	`365`	`source_ops(csdev)->disable(csdev, data);`
`366`		`- coresight_disable_helpers(csdev);`
	`366`	`+ coresight_disable_helpers(csdev, NULL);`
`367`	`367`	`}`
`368`	`368`	`EXPORT_SYMBOL_GPL(coresight_disable_source);`
`369`	`369`
`@@ -372,16 +372,16 @@ EXPORT_SYMBOL_GPL(coresight_disable_source);`
`372`	`372`	`* @nd in the list. If @nd is NULL, all the components, except the SOURCE are`
`373`	`373`	`* disabled.`
`374`	`374`	`*/`
`375`		`-static void coresight_disable_path_from(struct list_head *path,`
	`375`	`+static void coresight_disable_path_from(struct coresight_path *path,`
`376`	`376`	`struct coresight_node *nd)`
`377`	`377`	`{`
`378`	`378`	`u32 type;`
`379`	`379`	`struct coresight_device csdev, parent, *child;`
`380`	`380`
`381`	`381`	`if (!nd)`
`382`		`- nd = list_first_entry(path, struct coresight_node, link);`
	`382`	`+ nd = list_first_entry(&path->path_list, struct coresight_node, link);`
`383`	`383`
`384`		`- list_for_each_entry_continue(nd, path, link) {`
	`384`	`+ list_for_each_entry_continue(nd, &path->path_list, link) {`
`385`	`385`	`csdev = nd->csdev;`
`386`	`386`	`type = csdev->type;`
`387`	`387`
`@@ -419,11 +419,11 @@ static void coresight_disable_path_from(struct list_head *path,`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`/* Disable all helpers adjacent along the path last */`
`422`		`- coresight_disable_helpers(csdev);`
	`422`	`+ coresight_disable_helpers(csdev, path);`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`426`		`-void coresight_disable_path(struct list_head *path)`
	`426`	`+void coresight_disable_path(struct coresight_path *path)`
`427`	`427`	`{`
`428`	`428`	`coresight_disable_path_from(path, NULL);`
`429`	`429`	`}`
`@@ -448,7 +448,7 @@ static int coresight_enable_helpers(struct coresight_device *csdev,`
`448`	`448`	`return 0;`
`449`	`449`	`}`
`450`	`450`
`451`		`-int coresight_enable_path(struct list_head *path, enum cs_mode mode,`
	`451`	`+int coresight_enable_path(struct coresight_path *path, enum cs_mode mode,`
`452`	`452`	`void *sink_data)`
`453`	`453`	`{`
`454`	`454`	`int ret = 0;`
`@@ -458,12 +458,12 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,`
`458`	`458`	`struct coresight_device *source;`
`459`	`459`
`460`	`460`	`source = coresight_get_source(path);`
`461`		`- list_for_each_entry_reverse(nd, path, link) {`
	`461`	`+ list_for_each_entry_reverse(nd, &path->path_list, link) {`
`462`	`462`	`csdev = nd->csdev;`
`463`	`463`	`type = csdev->type;`
`464`	`464`
`465`	`465`	`/* Enable all helpers adjacent to the path first */`
`466`		`- ret = coresight_enable_helpers(csdev, mode, sink_data);`
	`466`	`+ ret = coresight_enable_helpers(csdev, mode, path);`
`467`	`467`	`if (ret)`
`468`	`468`	`goto err;`
`469`	`469`	`/*`
`@@ -511,20 +511,21 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,`
`511`	`511`	`goto out;`
`512`	`512`	`}`
`513`	`513`
`514`		`-struct coresight_device coresight_get_sink(struct list_head path)`
	`514`	`+struct coresight_device coresight_get_sink(struct coresight_path path)`
`515`	`515`	`{`
`516`	`516`	`struct coresight_device *csdev;`
`517`	`517`
`518`	`518`	`if (!path)`
`519`	`519`	`return NULL;`
`520`	`520`
`521`		`- csdev = list_last_entry(path, struct coresight_node, link)->csdev;`
	`521`	`+ csdev = list_last_entry(&path->path_list, struct coresight_node, link)->csdev;`
`522`	`522`	`if (csdev->type != CORESIGHT_DEV_TYPE_SINK &&`
`523`	`523`	`csdev->type != CORESIGHT_DEV_TYPE_LINKSINK)`
`524`	`524`	`return NULL;`
`525`	`525`
`526`	`526`	`return csdev;`
`527`	`527`	`}`
	`528`	`+EXPORT_SYMBOL_GPL(coresight_get_sink);`
`528`	`529`
`529`	`530`	`u32 coresight_get_sink_id(struct coresight_device *csdev)`
`530`	`531`	`{`
`@@ -680,7 +681,7 @@ static int coresight_get_trace_id(struct coresight_device *csdev,`
`680`	`681`	`void coresight_path_assign_trace_id(struct coresight_path *path,`
`681`	`682`	`enum cs_mode mode)`
`682`	`683`	`{`
`683`		`- struct coresight_device *sink = coresight_get_sink(&path->path_list);`
	`684`	`+ struct coresight_device *sink = coresight_get_sink(path);`
`684`	`685`	`struct coresight_node *nd;`
`685`	`686`	`int trace_id;`
`686`	`687`