Commit 080ee83c authored by Jie Gan's avatar Jie Gan Committed by Suzuki K Poulose
Browse files

Coresight: Change functions to accept the coresight_path 



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: default avatarJie Gan <quic_jiegan@quicinc.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20250303032931.2500935-8-quic_jiegan@quicinc.com
parent 7b365f05

drivers/hwtracing/coresight/coresight-core.c

+19 −18
Original line number Diff line number Diff line
@@ -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,12 +333,12 @@ 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;
@@ -346,7 +346,7 @@ static void coresight_disable_helpers(struct coresight_device *csdev) 
	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;

drivers/hwtracing/coresight/coresight-etm-perf.c

+7 −9
Original line number Diff line number Diff line
@@ -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)

drivers/hwtracing/coresight/coresight-priv.h

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/hwtracing/coresight/coresight-sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -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: