Skip to content

Commit e560083

Browse files
Mani-Sadhasivamvireshk
authored andcommitted
OPP: debugfs: Use performance level if available to distinguish between rates
Some OPP tables have entries with same rate and different performance level. For these entries, using only the rate as the debugfs directory name causes below error: debugfs: 'opp:5000000' already exists in 'soc@0-1c00000.pci' Fix it by appending the performance level to the dir name if available. Reported-by: Bjorn Andersson <andersson@kernel.org> Closes: https://lore.kernel.org/linux-arm-msm/75lzykd37zdvrks5i2bb4zb2yzjtm25kv3hegmikndkbr772mz@w2ykff3ny45u/ Fixes: 05db359 ("OPP: Add support to find OPP for a set of keys") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent 6de23f8 commit e560083

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

drivers/opp/debugfs.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,24 @@ void opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
130130
{
131131
struct dentry *pdentry = opp_table->dentry;
132132
struct dentry *d;
133-
unsigned long id;
134-
char name[25]; /* 20 chars for 64 bit value + 5 (opp:\0) */
133+
char name[36]; /* "opp:"(4) + u64(20) + "-" (1) + u32(10) + NULL(1) */
135134

136135
/*
137136
* Get directory name for OPP.
138137
*
139-
* - Normally rate is unique to each OPP, use it to get unique opp-name.
138+
* - Normally rate is unique to each OPP, use it to get unique opp-name,
139+
* together with performance level if available.
140140
* - For some devices rate isn't available or there are multiple, use
141141
* index instead for them.
142142
*/
143-
if (likely(opp_table->clk_count == 1 && opp->rates[0]))
144-
id = opp->rates[0];
145-
else
146-
id = _get_opp_count(opp_table);
147-
148-
snprintf(name, sizeof(name), "opp:%lu", id);
143+
if (likely(opp_table->clk_count == 1 && opp->rates[0])) {
144+
if (opp->level == OPP_LEVEL_UNSET)
145+
snprintf(name, sizeof(name), "opp:%lu", opp->rates[0]);
146+
else
147+
snprintf(name, sizeof(name), "opp:%lu-%u", opp->rates[0], opp->level);
148+
} else {
149+
snprintf(name, sizeof(name), "opp:%u", _get_opp_count(opp_table));
150+
}
149151

150152
/* Create per-opp directory */
151153
d = debugfs_create_dir(name, pdentry);

0 commit comments

Comments
 (0)