From: Georgi Djakov <georgi.djakov@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Georgi Djakov <georgi.djakov@linaro.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Subject: [PATCH 04/12] interconnect: Add a name to struct icc_path
Date: Fri, 17 Jan 2020 11:58:08 +0200 [thread overview]
Message-ID: <20200117095816.23575-5-georgi.djakov@linaro.org> (raw)
In-Reply-To: <20200117095816.23575-1-georgi.djakov@linaro.org>
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.
Suggested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
---
drivers/interconnect/core.c | 18 +++++++++++++++---
drivers/interconnect/internal.h | 2 ++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index f30a326dc7ce..4f9bdb7f9165 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -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);
diff --git a/drivers/interconnect/internal.h b/drivers/interconnect/internal.h
index 5853e8faf223..bf18cb7239df 100644
--- a/drivers/interconnect/internal.h
+++ b/drivers/interconnect/internal.h
@@ -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[];
};
next prev parent reply other threads:[~2020-01-17 9:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 9:58 [GIT PULL 00/12] interconnect changes for 5.6 Georgi Djakov
2020-01-17 9:58 ` [PATCH 01/12] interconnect: Add a common helper for removing all nodes Georgi Djakov
2020-01-17 9:58 ` [PATCH 02/12] interconnect: qcom: Use the new common helper for node removal Georgi Djakov
2020-01-17 9:58 ` [PATCH 03/12] interconnect: Move internal structs into a separate file Georgi Djakov
2020-01-17 9:58 ` Georgi Djakov [this message]
2020-01-17 9:58 ` [PATCH 05/12] interconnect: Add basic tracepoints Georgi Djakov
2020-01-17 9:58 ` [PATCH 06/12] interconnect: Add a common standard aggregate function Georgi Djakov
2020-01-17 9:58 ` [PATCH 07/12] interconnect: qcom: Use the " Georgi Djakov
2020-01-17 9:58 ` [PATCH 08/12] interconnect: Add interconnect_graph file to debugfs Georgi Djakov
2020-01-17 9:58 ` [PATCH 09/12] interconnect: Print the tag in the debugfs summary Georgi Djakov
2020-01-17 9:58 ` [PATCH 10/12] interconnect: Check for valid path in icc_set_bw() Georgi Djakov
2020-01-17 9:58 ` [PATCH 11/12] dt-bindings: interconnect: Add Qualcomm MSM8916 DT bindings Georgi Djakov
2020-01-17 9:58 ` [PATCH 12/12] interconnect: qcom: Add MSM8916 interconnect provider driver Georgi Djakov
2020-01-22 9:05 ` [GIT PULL 00/12] interconnect changes for 5.6 Greg KH
2020-01-22 9:15 ` Georgi Djakov
2020-01-22 9:07 ` Georgi Djakov
2020-01-22 9:15 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200117095816.23575-5-georgi.djakov@linaro.org \
--to=georgi.djakov@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox