The commit 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name
as devfreq(X) for sysfs"") roll back the device name from 'devfreqX'
to device name explained in DT. After applied commit 66d0e797bf09,
the indentation of devfreq_summary debugfs node was broken.
So, fix indentaion of devfreq_summary debugfs node as following:
For example on Exynos5422-based Odroid-XU3 board,
$ cat /sys/kernel/debug/devfreq/devfreq_summary
dev parent_dev governor polling_ms cur_freq_Hz min_freq_Hz max_freq_Hz
------------------------------ ------------------------------ --------------- ---------- ------------ ------------ ------------
10c20000.memory-controller null simple_ondemand 0 413000000 165000000 825000000
soc:bus_wcore null simple_ondemand 50 88700000 88700000 532000000
soc:bus_noc soc:bus_wcore passive 0 66600000 66600000 111000000
soc:bus_fsys_apb soc:bus_wcore passive 0 111000000 111000000 222000000
soc:bus_fsys soc:bus_wcore passive 0 75000000 75000000 200000000
soc:bus_fsys2 soc:bus_wcore passive 0 75000000 75000000 200000000
soc:bus_mfc soc:bus_wcore passive 0 83250000 83250000 333000000
soc:bus_gen soc:bus_wcore passive 0 88700000 88700000 266000000
soc:bus_peri soc:bus_wcore passive 0 66600000 66600000 66600000
soc:bus_g2d soc:bus_wcore passive 0 83250000 83250000 333000000
soc:bus_g2d_acp soc:bus_wcore passive 0 0 66500000 266000000
soc:bus_jpeg soc:bus_wcore passive 0 0 75000000 300000000
soc:bus_jpeg_apb soc:bus_wcore passive 0 0 83250000 166500000
soc:bus_disp1_fimd soc:bus_wcore passive 0 0 120000000 200000000
soc:bus_disp1 soc:bus_wcore passive 0 0 120000000 300000000
soc:bus_gscl_scaler soc:bus_wcore passive 0 0 150000000 300000000
soc:bus_mscl soc:bus_wcore passive 0 0 84000000 666000000
Cc: [email protected]
Fixes: commit 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"")
Signed-off-by: Chanwoo Choi <[email protected]>
---
drivers/devfreq/devfreq.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index ce82bdb5fa5c..2ff35ec1b53b 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -1839,8 +1839,7 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
unsigned long cur_freq, min_freq, max_freq;
unsigned int polling_ms;
- seq_printf(s, "%-30s %-10s %-10s %-15s %10s %12s %12s %12s\n",
- "dev_name",
+ seq_printf(s, "%-30s %-30s %-15s %10s %12s %12s %12s\n",
"dev",
"parent_dev",
"governor",
@@ -1848,10 +1847,9 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
"cur_freq_Hz",
"min_freq_Hz",
"max_freq_Hz");
- seq_printf(s, "%30s %10s %10s %15s %10s %12s %12s %12s\n",
+ seq_printf(s, "%30s %30s %15s %10s %12s %12s %12s\n",
+ "------------------------------",
"------------------------------",
- "----------",
- "----------",
"---------------",
"----------",
"------------",
@@ -1880,8 +1878,7 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
mutex_unlock(&devfreq->lock);
seq_printf(s,
- "%-30s %-10s %-10s %-15s %10d %12ld %12ld %12ld\n",
- dev_name(devfreq->dev.parent),
+ "%-30s %-30s %-15s %10d %12ld %12ld %12ld\n",
dev_name(&devfreq->dev),
p_devfreq ? dev_name(&p_devfreq->dev) : "null",
devfreq->governor_name,
--
2.17.1
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"").
The bot has tested the following trees: v5.7.8, v5.4.51, v4.19.132, v4.14.188.
v5.7.8: Build OK!
v5.4.51: Failed to apply! Possible dependencies:
490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
v4.19.132: Failed to apply! Possible dependencies:
490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
v4.14.188: Failed to apply! Possible dependencies:
490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
Hi,
On 7/18/20 2:08 AM, Sasha Levin wrote:
> Hi
>
> [This is an automated email]
>
> This commit has been processed because it contains a "Fixes:" tag
> fixing commit: 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"").
>
> The bot has tested the following trees: v5.7.8, v5.4.51, v4.19.132, v4.14.188.
>
> v5.7.8: Build OK!
> v5.4.51: Failed to apply! Possible dependencies:
> 490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
>
> v4.19.132: Failed to apply! Possible dependencies:
> 490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
>
> v4.14.188: Failed to apply! Possible dependencies:
> 490a421bc575d ("PM / devfreq: Add debugfs support with devfreq_summary file")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
>
The fixes commit was merged to v5.6-rc4. As your test result,
it was possible to build above v5.6. It is not problem. Thanks for your testing.
- 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"").
--
Best Regards,
Chanwoo Choi
Samsung Electronics
On 7/13/20 4:31 PM, Chanwoo Choi wrote:
> The commit 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name
> as devfreq(X) for sysfs"") roll back the device name from 'devfreqX'
> to device name explained in DT. After applied commit 66d0e797bf09,
> the indentation of devfreq_summary debugfs node was broken.
>
> So, fix indentaion of devfreq_summary debugfs node as following:
>
> For example on Exynos5422-based Odroid-XU3 board,
> $ cat /sys/kernel/debug/devfreq/devfreq_summary
> dev parent_dev governor polling_ms cur_freq_Hz min_freq_Hz max_freq_Hz
> ------------------------------ ------------------------------ --------------- ---------- ------------ ------------ ------------
> 10c20000.memory-controller null simple_ondemand 0 413000000 165000000 825000000
> soc:bus_wcore null simple_ondemand 50 88700000 88700000 532000000
> soc:bus_noc soc:bus_wcore passive 0 66600000 66600000 111000000
> soc:bus_fsys_apb soc:bus_wcore passive 0 111000000 111000000 222000000
> soc:bus_fsys soc:bus_wcore passive 0 75000000 75000000 200000000
> soc:bus_fsys2 soc:bus_wcore passive 0 75000000 75000000 200000000
> soc:bus_mfc soc:bus_wcore passive 0 83250000 83250000 333000000
> soc:bus_gen soc:bus_wcore passive 0 88700000 88700000 266000000
> soc:bus_peri soc:bus_wcore passive 0 66600000 66600000 66600000
> soc:bus_g2d soc:bus_wcore passive 0 83250000 83250000 333000000
> soc:bus_g2d_acp soc:bus_wcore passive 0 0 66500000 266000000
> soc:bus_jpeg soc:bus_wcore passive 0 0 75000000 300000000
> soc:bus_jpeg_apb soc:bus_wcore passive 0 0 83250000 166500000
> soc:bus_disp1_fimd soc:bus_wcore passive 0 0 120000000 200000000
> soc:bus_disp1 soc:bus_wcore passive 0 0 120000000 300000000
> soc:bus_gscl_scaler soc:bus_wcore passive 0 0 150000000 300000000
> soc:bus_mscl soc:bus_wcore passive 0 0 84000000 666000000
>
> Cc: [email protected]
> Fixes: commit 66d0e797bf09 ("Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"")
> Signed-off-by: Chanwoo Choi <[email protected]>
> ---
> drivers/devfreq/devfreq.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index ce82bdb5fa5c..2ff35ec1b53b 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -1839,8 +1839,7 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
> unsigned long cur_freq, min_freq, max_freq;
> unsigned int polling_ms;
>
> - seq_printf(s, "%-30s %-10s %-10s %-15s %10s %12s %12s %12s\n",
> - "dev_name",
> + seq_printf(s, "%-30s %-30s %-15s %10s %12s %12s %12s\n",
> "dev",
> "parent_dev",
> "governor",
> @@ -1848,10 +1847,9 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
> "cur_freq_Hz",
> "min_freq_Hz",
> "max_freq_Hz");
> - seq_printf(s, "%30s %10s %10s %15s %10s %12s %12s %12s\n",
> + seq_printf(s, "%30s %30s %15s %10s %12s %12s %12s\n",
> + "------------------------------",
> "------------------------------",
> - "----------",
> - "----------",
> "---------------",
> "----------",
> "------------",
> @@ -1880,8 +1878,7 @@ static int devfreq_summary_show(struct seq_file *s, void *data)
> mutex_unlock(&devfreq->lock);
>
> seq_printf(s,
> - "%-30s %-10s %-10s %-15s %10d %12ld %12ld %12ld\n",
> - dev_name(devfreq->dev.parent),
> + "%-30s %-30s %-15s %10d %12ld %12ld %12ld\n",
> dev_name(&devfreq->dev),
> p_devfreq ? dev_name(&p_devfreq->dev) : "null",
> devfreq->governor_name,
>
Applied it. Thanks.
--
Best Regards,
Chanwoo Choi
Samsung Electronics