android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coresight: funnel: add support for multiple output ports

Browse Source 
Funnel devices are now capable of supporting multiple-inputs and
multiple-outputs configuration with in built hardware filtering
for TPDM devices. Add software support to this function. Output
ports is selected according to the source of the trace path.

Change-Id: I491293e0b1948f3747d34eb79e7845617ace4244
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
This commit is contained in:
Mao Jinlong 2020-12-14 02:11:35 -08:00
parent 1cdba1d4a7
commit b75c053c29
3 changed files with 64 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/hwtracing/coresight/coresight-core.c
View File

@ -54,6 +54,8 @@ static LIST_HEAD(cs_active_paths);
const u32 coresight_barrier_pkt[4] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff};
EXPORT_SYMBOL_GPL(coresight_barrier_pkt);
static struct coresight_device *coresight_get_source(struct list_head *path);
static const struct cti_assoc_op *cti_assoc_ops;
void coresight_set_cti_ops(const struct cti_assoc_op *cti_op)
@ -107,6 +109,31 @@ static int coresight_source_is_unique(struct coresight_device *csdev)
csdev, coresight_id_match);
}
/**
* coresight_source_filter - checks whether the connection matches the source
* of path if connection is binded to specific source.
* @path: The list of devices
* @conn: The connection of one outport
*
* Return zero if the connection doesn't have a source binded or source of the
* path matches the source binds to connection.
*/
static int coresight_source_filter(struct list_head *path,
struct coresight_connection *conn)
{
int ret = 0;
struct coresight_device *source = NULL;
if (conn->source_name == NULL)
return ret;
source = coresight_get_source(path);
if (source == NULL)
return ret;
return strcmp(conn->source_name, dev_name(&source->dev));
}
static int coresight_reset_sink(struct device *dev, void *data)
{
struct coresight_device *csdev = to_coresight_device(dev);
@ -125,13 +152,16 @@ static void coresight_reset_all_sink(void)
}
static int coresight_find_link_inport(struct coresight_device *csdev,
struct coresight_device *parent)
struct coresight_device *parent,
struct list_head *path)
{
int i;
struct coresight_connection *conn;
for (i = 0; i < parent->pdata->nr_outport; i++) {
conn = &parent->pdata->conns[i];
if (coresight_source_filter(path, conn))
continue;
if (conn->child_dev == csdev)
return conn->child_port;
}
@ -143,13 +173,16 @@ static int coresight_find_link_inport(struct coresight_device *csdev,
}
static int coresight_find_link_outport(struct coresight_device *csdev,
struct coresight_device *child)
struct coresight_device *child,
struct list_head *path)
{
int i;
struct coresight_connection *conn;
for (i = 0; i < csdev->pdata->nr_outport; i++) {
conn = &csdev->pdata->conns[i];
if (coresight_source_filter(path, conn))
continue;
if (conn->child_dev == child)
return conn->outport;
}
@ -347,7 +380,8 @@ static void coresight_disable_sink(struct coresight_device *csdev)
static int coresight_enable_link(struct coresight_device *csdev,
struct coresight_device *parent,
struct coresight_device *child)
struct coresight_device *child,
struct list_head *path)
{
int ret = 0;
int link_subtype;
@ -356,8 +390,8 @@ static int coresight_enable_link(struct coresight_device *csdev,
if (!parent || !child)
return -EINVAL;
inport = coresight_find_link_inport(csdev, parent);
outport = coresight_find_link_outport(csdev, child);
inport = coresight_find_link_inport(csdev, parent, path);
outport = coresight_find_link_outport(csdev, child, path);
link_subtype = csdev->subtype.link_subtype;
if (link_subtype == CORESIGHT_DEV_SUBTYPE_LINK_MERG && inport < 0)
@ -382,7 +416,8 @@ static int coresight_enable_link(struct coresight_device *csdev,
static void coresight_disable_link(struct coresight_device *csdev,
struct coresight_device *parent,
struct coresight_device *child)
struct coresight_device *child,
struct list_head *path)
{
int i, nr_conns;
int link_subtype;
@ -391,8 +426,8 @@ static void coresight_disable_link(struct coresight_device *csdev,
if (!parent || !child)
return;
inport = coresight_find_link_inport(csdev, parent);
outport = coresight_find_link_outport(csdev, child);
inport = coresight_find_link_inport(csdev, parent, path);
outport = coresight_find_link_outport(csdev, child, path);
link_subtype = csdev->subtype.link_subtype;
if (link_subtype == CORESIGHT_DEV_SUBTYPE_LINK_MERG) {
@ -507,7 +542,7 @@ static void coresight_disable_path_from(struct list_head *path,
case CORESIGHT_DEV_TYPE_LINK:
parent = list_prev_entry(nd, link)->csdev;
child = list_next_entry(nd, link)->csdev;
coresight_disable_link(csdev, parent, child);
coresight_disable_link(csdev, parent, child, path);
break;
default:
break;
@ -562,7 +597,7 @@ int coresight_enable_path(struct list_head *path, u32 mode, void *sink_data)
case CORESIGHT_DEV_TYPE_LINK:
parent = list_prev_entry(nd, link)->csdev;
child = list_next_entry(nd, link)->csdev;
ret = coresight_enable_link(csdev, parent, child);
ret = coresight_enable_link(csdev, parent, child, path);
if (ret)
goto err;
break;
@ -784,7 +819,8 @@ static void coresight_drop_device(struct coresight_device *csdev)
*/
static int _coresight_build_path(struct coresight_device *csdev,
struct coresight_device *sink,
struct list_head *path)
struct list_head *path,
struct coresight_device *source)
{
int i, ret;
bool found = false;
@ -799,8 +835,12 @@ static int _coresight_build_path(struct coresight_device *csdev,
struct coresight_device *child_dev;
child_dev = csdev->pdata->conns[i].child_dev;
if (csdev->pdata->conns[i].source_name &&
strcmp(csdev->pdata->conns[i].source_name,
dev_name(&source->dev)))
continue;
if (child_dev &&
_coresight_build_path(child_dev, sink, path) == 0) {
_coresight_build_path(child_dev, sink, path, source) == 0) {
found = true;
break;
}
@ -845,7 +885,7 @@ struct list_head *coresight_build_path(struct coresight_device *source,
INIT_LIST_HEAD(path);
rc = _coresight_build_path(source, sink, path);
rc = _coresight_build_path(source, sink, path, source);
if (rc) {
kfree(path);
return ERR_PTR(rc);

10
drivers/hwtracing/coresight/coresight-platform.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2012, The Linux Foundation. All rights reserved.
* Copyright (c) 2012, 2020 The Linux Foundation. All rights reserved.
*/
#include <linux/acpi.h>
@ -219,6 +219,7 @@ static int of_coresight_parse_endpoint(struct device *dev,
struct device *rdev = NULL;
struct fwnode_handle *rdev_fwnode;
struct coresight_connection *conn;
struct device_node *sn = NULL;
do {
/* Parse the local port details */
@ -263,6 +264,13 @@ static int of_coresight_parse_endpoint(struct device *dev,
*/
conn->child_fwnode = fwnode_handle_get(rdev_fwnode);
conn->child_port = rendpoint.port;
conn->source_name = NULL;
sn = of_parse_phandle(ep, "source", 0);
if (sn) {
ret = of_property_read_string(sn,
"coresight-name", &conn->source_name);
of_node_put(sn);
}
/* Connection record updated */
} while (0);

2
include/linux/coresight.h
View File

@ -140,6 +140,7 @@ struct coresight_desc {
* struct coresight_connection - representation of a single connection
* @outport: a connection's output port number.
* @child_port: remote component's port number @output is connected to.
* @source_name: source component's name.
* @chid_fwnode: remote component's fwnode handle.
* @child_dev: a @coresight_device representation of the component
connected to @outport.
@ -148,6 +149,7 @@ struct coresight_desc {
struct coresight_connection {
int outport;
int child_port;
const char *source_name;
struct fwnode_handle *child_fwnode;
struct coresight_device *child_dev;
struct coresight_sysfs_link *link;