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

Commit 8d8f1c67 authored by Georgi Djakov's avatar Georgi Djakov Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: interconnect: Add a name to struct icc_path 



When debugging interconnect things, it turned out that saving the path
name and including it in the traces is quite useful, especially for
devices with multiple paths.

For the path name we use the one specified in DT, or if we use platform
data, the name is based on the source and destination node names.

Bug: 151255205
Suggested-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
(cherry picked from commit 05309830e1f869f939e283576dd3684313390062)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I81ef3e94092682e8ca986f4dafce03be46e28218
parent 33d94128

drivers/interconnect/core.c

+15 −3
Original line number Diff line number Diff line
@@ -356,9 +356,17 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) 


	mutex_lock(&icc_lock);

	path = path_find(dev, src_node, dst_node);

	if (IS_ERR(path))

		dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));

	mutex_unlock(&icc_lock);

	if (IS_ERR(path)) {

		dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));

		return path;

	}



	if (name)

		path->name = kstrdup_const(name, GFP_KERNEL);

	else

		path->name = kasprintf(GFP_KERNEL, "%s-%s",

				       src_node->name, dst_node->name);



	return path;

}
@@ -481,9 +489,12 @@ struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id) 
		goto out;



	path = path_find(dev, src, dst);

	if (IS_ERR(path))

	if (IS_ERR(path)) {

		dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));

		goto out;

	}



	path->name = kasprintf(GFP_KERNEL, "%s-%s", src->name, dst->name);

out:

	mutex_unlock(&icc_lock);

	return path;
@@ -519,6 +530,7 @@ void icc_put(struct icc_path *path) 
	}

	mutex_unlock(&icc_lock);



	kfree_const(path->name);

	kfree(path);

}

EXPORT_SYMBOL_GPL(icc_put);

drivers/interconnect/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ struct icc_req { 


/**

 * struct icc_path - interconnect path structure

 * @name: a string name of the path (useful for ftrace)

 * @num_nodes: number of hops (nodes)

 * @reqs: array of the requests applicable to this path of nodes

 */

struct icc_path {

	const char *name;

	size_t num_nodes;

	struct icc_req reqs[];

};