Hi,
This serie cleans and adds regulator support to Panfrost devfreq.
This is mostly based on comment for the freshly introduced lima
devfreq.
We need to add regulator support because on Allwinner the GPU OPP
table defines both frequencies and voltages.
First patches [01-07] should not change the actual behavior
and introduce a proper panfrost_devfreq struct.
Regards,
Clément
Clément Péron (14):
drm/panfrost: avoid static declaration
drm/panfrost: clean headers in devfreq
drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle
drm/panfrost: introduce panfrost_devfreq struct
drm/panfrost: use spinlock instead of atomic
drm/panfrost: properly handle error in probe
drm/panfrost: rename error labels in device_init
drm/panfrost: move devfreq_init()/fini() in device
drm/panfrost: dynamically alloc regulators
drm/panfrost: add regulators to devfreq
arm64: defconfig: Enable devfreq cooling device
arm64: dts: allwinner: h6: Add cooling map for GPU
[DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table
[DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always
.../dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 102 +++++++++++
arch/arm64/configs/defconfig | 1 +
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 165 ++++++++++++------
drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +++-
drivers/gpu/drm/panfrost/panfrost_device.c | 61 ++++---
drivers/gpu/drm/panfrost/panfrost_device.h | 14 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +-
drivers/gpu/drm/panfrost/panfrost_job.c | 10 +-
9 files changed, 290 insertions(+), 109 deletions(-)
--
2.25.1
Hi,
On Sat, 4 Jul 2020 at 12:25, Clément Péron <[email protected]> wrote:
>
> Hi,
>
> This serie cleans and adds regulator support to Panfrost devfreq.
> This is mostly based on comment for the freshly introduced lima
> devfreq.
>
> We need to add regulator support because on Allwinner the GPU OPP
> table defines both frequencies and voltages.
>
> First patches [01-07] should not change the actual behavior
> and introduce a proper panfrost_devfreq struct.
>
> Regards,
> Clément
Changes since v1:
- Collect Steven Price reviewed-by tags
- Fix spinlock comment
- Drop OPP clock-name path
- Drop device_property_test patch
- Add rename error labels patch
>
> Clément Péron (14):
> drm/panfrost: avoid static declaration
> drm/panfrost: clean headers in devfreq
> drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle
> drm/panfrost: introduce panfrost_devfreq struct
> drm/panfrost: use spinlock instead of atomic
> drm/panfrost: properly handle error in probe
> drm/panfrost: rename error labels in device_init
> drm/panfrost: move devfreq_init()/fini() in device
> drm/panfrost: dynamically alloc regulators
> drm/panfrost: add regulators to devfreq
> arm64: defconfig: Enable devfreq cooling device
> arm64: dts: allwinner: h6: Add cooling map for GPU
> [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table
> [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always
>
> .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
> arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 102 +++++++++++
> arch/arm64/configs/defconfig | 1 +
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 165 ++++++++++++------
> drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +++-
> drivers/gpu/drm/panfrost/panfrost_device.c | 61 ++++---
> drivers/gpu/drm/panfrost/panfrost_device.h | 14 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +-
> drivers/gpu/drm/panfrost/panfrost_job.c | 10 +-
> 9 files changed, 290 insertions(+), 109 deletions(-)
>
> --
> 2.25.1
>
Don't include not required headers and sort them.
Signed-off-by: Clément Péron <[email protected]>
Reviewed-by: Steven Price <[email protected]>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 1b560b903ea6..df7b71da9a84 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -1,18 +1,14 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright 2019 Collabora ltd. */
+
+#include <linux/clk.h>
#include <linux/devfreq.h>
#include <linux/devfreq_cooling.h>
#include <linux/platform_device.h>
#include <linux/pm_opp.h>
-#include <linux/clk.h>
-#include <linux/regulator/consumer.h>
#include "panfrost_device.h"
#include "panfrost_devfreq.h"
-#include "panfrost_features.h"
-#include "panfrost_issues.h"
-#include "panfrost_gpu.h"
-#include "panfrost_regs.h"
static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev)
{
--
2.25.1
Patches 1-12 are
Reviewed-by: Alyssa Rosenzweig <[email protected]>
Thank you!
On Sat, Jul 04, 2020 at 12:25:21PM +0200, Cl?ment P?ron wrote:
> Hi,
>
> This serie cleans and adds regulator support to Panfrost devfreq.
> This is mostly based on comment for the freshly introduced lima
> devfreq.
>
> We need to add regulator support because on Allwinner the GPU OPP
> table defines both frequencies and voltages.
>
> First patches [01-07] should not change the actual behavior
> and introduce a proper panfrost_devfreq struct.
>
> Regards,
> Cl?ment
>
> Cl?ment P?ron (14):
> drm/panfrost: avoid static declaration
> drm/panfrost: clean headers in devfreq
> drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle
> drm/panfrost: introduce panfrost_devfreq struct
> drm/panfrost: use spinlock instead of atomic
> drm/panfrost: properly handle error in probe
> drm/panfrost: rename error labels in device_init
> drm/panfrost: move devfreq_init()/fini() in device
> drm/panfrost: dynamically alloc regulators
> drm/panfrost: add regulators to devfreq
> arm64: defconfig: Enable devfreq cooling device
> arm64: dts: allwinner: h6: Add cooling map for GPU
> [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table
> [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always
>
> .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
> arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 102 +++++++++++
> arch/arm64/configs/defconfig | 1 +
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 165 ++++++++++++------
> drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +++-
> drivers/gpu/drm/panfrost/panfrost_device.c | 61 ++++---
> drivers/gpu/drm/panfrost/panfrost_device.h | 14 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +-
> drivers/gpu/drm/panfrost/panfrost_job.c | 10 +-
> 9 files changed, 290 insertions(+), 109 deletions(-)
>
> --
> 2.25.1
>
Hello Cl?ment,
On Sat, Jul 04, 2020 at 12:25:21PM +0200, Cl?ment P?ron wrote:
> Hi,
>
> This serie cleans and adds regulator support to Panfrost devfreq.
> This is mostly based on comment for the freshly introduced lima
> devfreq.
I tried to test the series, but I'm unsure what it's meant to
be based on.
It doesn't appply on top of linux-next and while it applies on
top of 5.8-rc3, it fails to run due to ordering of
dev_pm_opp_set_regulators and dev_pm_opp_of_add_table
where this patch series places
dev_pm_opp_of_add_table after dev_pm_opp_of_add_table
which fails with this warning:
https://elixir.bootlin.com/linux/v5.8-rc3/source/drivers/opp/core.c#L1696
[ 0.155455] ------------[ cut here ]------------
[ 0.155473] WARNING: CPU: 2 PID: 1 at drivers/opp/core.c:1696 dev_pm_opp_set_regulators+0x134/0x1f0
[ 0.155476] Modules linked in:
[ 0.155487] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.8.0-rc4-00328-gf89269f4a65c #12
[ 0.155489] Hardware name: OrangePi 3 (DT)
[ 0.155496] pstate: 20000005 (nzCv daif -PAN -UAO BTYPE=--)
[ 0.155502] pc : dev_pm_opp_set_regulators+0x134/0x1f0
[ 0.155507] lr : dev_pm_opp_set_regulators+0x28/0x1f0
[ 0.155510] sp : ffffffc01002bb00
[ 0.155512] x29: ffffffc01002bb00 x28: 0000000000000000
[ 0.155518] x27: ffffffc0113b03b0 x26: ffffffc011431960
[ 0.155523] x25: ffffffc011397a70 x24: ffffff807b6a2410
[ 0.155528] x23: 0000000000000001 x22: ffffffc010f290a0
[ 0.155533] x21: ffffff80789e3880 x20: ffffff80789e3ac8
[ 0.155538] x19: ffffff80789e4400 x18: 00000000fffffffe
[ 0.155543] x17: 0000000000000001 x16: 0000000000000019
[ 0.155548] x15: 0000000000000001 x14: ffffffffffffffff
[ 0.155553] x13: ffffffc01169fe00 x12: 0000000000000005
[ 0.155558] x11: 0000000000000007 x10: 0101010101010101
[ 0.155563] x9 : ffffffffffffffff x8 : 7f7f7f7f7f7f7f7f
[ 0.155568] x7 : fefefeff646c606d x6 : 01111d48f3f5f3f0
[ 0.155573] x5 : 70737573481d1101 x4 : 0000000000000000
[ 0.155577] x3 : ffffff80789e4450 x2 : 0000000000000000
[ 0.155582] x1 : ffffff807b490000 x0 : ffffff8078c2fe00
[ 0.155587] Call trace:
[ 0.155595] dev_pm_opp_set_regulators+0x134/0x1f0
[ 0.155603] panfrost_devfreq_init+0x70/0x178
[ 0.155608] panfrost_device_init+0x108/0x5d8
[ 0.155613] panfrost_probe+0xa4/0x178
[ 0.155619] platform_drv_probe+0x50/0xa0
[ 0.155626] really_probe+0xd4/0x318
[ 0.155631] driver_probe_device+0x54/0xb0
[ 0.155638] device_driver_attach+0x6c/0x78
[ 0.155643] __driver_attach+0x54/0xd0
[ 0.155649] bus_for_each_dev+0x5c/0x98
[ 0.155654] driver_attach+0x20/0x28
[ 0.155660] bus_add_driver+0x140/0x1e8
[ 0.155666] driver_register+0x60/0x110
[ 0.155670] __platform_driver_register+0x44/0x50
[ 0.155678] panfrost_driver_init+0x18/0x20
[ 0.155685] do_one_initcall+0x3c/0x160
[ 0.155691] kernel_init_freeable+0x20c/0x2b0
[ 0.155698] kernel_init+0x10/0x104
[ 0.155703] ret_from_fork+0x10/0x1c
[ 0.155712] ---[ end trace ed26920b0484a95e ]---
[ 0.155725] panfrost 1800000.gpu: [drm:panfrost_devfreq_init] *ERROR* Couldn't set OPP regulators
[ 0.156710] panfrost 1800000.gpu: devfreq init failed -16
[ 0.156725] panfrost 1800000.gpu: Fatal error during GPU init
[ 0.156795] panfrost: probe of 1800000.gpu failed with error -16
[ 0.157158] cacheinfo: Unable to detect cache hierarchy for CPU 0
thank you and regards,
o.
> We need to add regulator support because on Allwinner the GPU OPP
> table defines both frequencies and voltages.
>
> First patches [01-07] should not change the actual behavior
> and introduce a proper panfrost_devfreq struct.
>
> Regards,
> Cl?ment
>
> Cl?ment P?ron (14):
> drm/panfrost: avoid static declaration
> drm/panfrost: clean headers in devfreq
> drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle
> drm/panfrost: introduce panfrost_devfreq struct
> drm/panfrost: use spinlock instead of atomic
> drm/panfrost: properly handle error in probe
> drm/panfrost: rename error labels in device_init
> drm/panfrost: move devfreq_init()/fini() in device
> drm/panfrost: dynamically alloc regulators
> drm/panfrost: add regulators to devfreq
> arm64: defconfig: Enable devfreq cooling device
> arm64: dts: allwinner: h6: Add cooling map for GPU
> [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table
> [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always
>
> .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
> arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 102 +++++++++++
> arch/arm64/configs/defconfig | 1 +
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 165 ++++++++++++------
> drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +++-
> drivers/gpu/drm/panfrost/panfrost_device.c | 61 ++++---
> drivers/gpu/drm/panfrost/panfrost_device.h | 14 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +-
> drivers/gpu/drm/panfrost/panfrost_job.c | 10 +-
> 9 files changed, 290 insertions(+), 109 deletions(-)
>
> --
> 2.25.1
>