Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f32974 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Yabin Cui
Browse files

UPSTREAM: coresight: perf: Add helper to retrieve sink configuration 



(Upstream commit d25054ee8d18c937058a1b69b35fa5bfdef471f3).

We can always find the sink configuration for a given perf_output_handle.
Add a helper to retrieve the sink configuration for a given
perf_output_handle. This will be used to get rid of the set_buffer()
call back.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 140266694
Change-Id: I0a9d8d9d8370fea5e4245697dca1e510d3f9438c
Signed-off-by: default avatarYabin Cui <yabinc@google.com>
parent 08ecb258

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

+0 −14
Original line number Diff line number Diff line
@@ -23,20 +23,6 @@ 
static struct pmu etm_pmu;

static bool etm_perf_up;



/**

 * struct etm_event_data - Coresight specifics associated to an event

 * @work:		Handle to free allocated memory outside IRQ context.

 * @mask:		Hold the CPU(s) this event was set for.

 * @snk_config:		The sink configuration.

 * @path:		An array of path, each slot for one CPU.

 */

struct etm_event_data {

	struct work_struct work;

	cpumask_t mask;

	void *snk_config;

	struct list_head * __percpu *path;

};



static DEFINE_PER_CPU(struct perf_output_handle, ctx_handle);

static DEFINE_PER_CPU(struct coresight_device *, csdev_src);

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

+26 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef _CORESIGHT_ETM_PERF_H

#define _CORESIGHT_ETM_PERF_H



#include <linux/percpu-defs.h>

#include "coresight-priv.h"



struct coresight_device;
@@ -42,14 +43,39 @@ struct etm_filters { 
	bool			ssstatus;

};



/**

 * struct etm_event_data - Coresight specifics associated to an event

 * @work:		Handle to free allocated memory outside IRQ context.

 * @mask:		Hold the CPU(s) this event was set for.

 * @snk_config:		The sink configuration.

 * @path:		An array of path, each slot for one CPU.

 */

struct etm_event_data {

	struct work_struct work;

	cpumask_t mask;

	void *snk_config;

	struct list_head * __percpu *path;

};



#ifdef CONFIG_CORESIGHT

int etm_perf_symlink(struct coresight_device *csdev, bool link);

static inline void *etm_perf_sink_config(struct perf_output_handle *handle)

{

	struct etm_event_data *data = perf_get_aux(handle);



	if (data)

		return data->snk_config;

	return NULL;

}

#else

static inline int etm_perf_symlink(struct coresight_device *csdev, bool link)

{ return -EINVAL; }



static inline void *etm_perf_sink_config(struct perf_output_handle *handle)

{

	return NULL;

}



#endif /* CONFIG_CORESIGHT */



#endif