mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-07-12 18:19:42 -07:00
mali-bifrost: revert 003 patch to the pre-sync ArchR version
The ROCKNIX-sourced rewrite of 003-midgard-refactor-power-init-and-
fixed-unbalanced-run.patch (picked up in 5805267f90) targets a
different kbase tree: it patches platform/devicetree/mali_kbase_runtime_pm.c
expecting `else if (!regulator_is_enabled(...))` on line 38.
Our mali_kbase pin (github.com/archr-linux/mali_kbase @ 422e192b)
does not have that line, so the hunk rejects and mali-bifrost:target
fails to install.
Restore the original 199-line patch that targets platform/meson/
mali_kbase_runtime_pm.c, which is the path that exists in our tree.
This was the file as of commit 5805267f90^ — the working pre-sync
state.
The ROCKNIX cleanup will become applicable when (and if) we move to
the same kbase revision they ship, which would itself be a bigger
upgrade.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Douglas Teles
+189
-29
@@ -1,39 +1,199 @@
|
||||
midgard: balance mali probe regulator refcount + drop regulator is_enabled guard
|
||||
From 5b1c50b3e181a57f5ce0a7d8c50f0f0823ac1609 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Reioux <reioux@gmail.com>
|
||||
Date: Wed, 12 Jun 2024 07:36:52 -0700
|
||||
Subject: [PATCH] midgard: refactor power init and fixed unbalanced runtime PM
|
||||
calls
|
||||
|
||||
Signed-off-by: Paul Reioux <reioux@gmail.com>
|
||||
---
|
||||
.../gpu/arm/midgard/mali_kbase_core_linux.c | 124 ++++++++++++------
|
||||
.../platform/meson/mali_kbase_runtime_pm.c | 11 +-
|
||||
2 files changed, 88 insertions(+), 47 deletions(-)
|
||||
|
||||
diff --git a/product/kernel/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/product/kernel/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||
index 0ad8a70..8db0c13 100644
|
||||
--- a/product/kernel/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||
+++ b/product/kernel/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
||||
@@ -4607,6 +4607,15 @@
|
||||
|
||||
kbdev->nr_regulators = i;
|
||||
dev_dbg(&pdev->dev, "Regulators probed: %u\n", kbdev->nr_regulators);
|
||||
@@ -4507,31 +4507,44 @@ int power_control_init(struct kbase_device *kbdev)
|
||||
|
||||
pdev = to_platform_device(kbdev->dev);
|
||||
|
||||
-#if defined(CONFIG_REGULATOR)
|
||||
- /* Since the error code EPROBE_DEFER causes the entire probing
|
||||
- * procedure to be restarted from scratch at a later time,
|
||||
- * all regulators will be released before returning.
|
||||
- *
|
||||
- * Any other error is ignored and the driver will continue
|
||||
- * operating with a partial initialization of regulators.
|
||||
- */
|
||||
- for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
|
||||
- kbdev->regulators[i] = regulator_get_optional(kbdev->dev, regulator_names[i]);
|
||||
- if (IS_ERR(kbdev->regulators[i])) {
|
||||
- err = PTR_ERR(kbdev->regulators[i]);
|
||||
- kbdev->regulators[i] = NULL;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- if (err == -EPROBE_DEFER) {
|
||||
- while (i > 0)
|
||||
- regulator_put(kbdev->regulators[--i]);
|
||||
- return err;
|
||||
+// #if defined(CONFIG_REGULATOR)
|
||||
+// /* Since the error code EPROBE_DEFER causes the entire probing
|
||||
+// * procedure to be restarted from scratch at a later time,
|
||||
+// * all regulators will be released before returning.
|
||||
+// *
|
||||
+// * Any other error is ignored and the driver will continue
|
||||
+// * operating with a partial initialization of regulators.
|
||||
+// */
|
||||
+// for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
|
||||
+// kbdev->regulators[i] = regulator_get_optional(kbdev->dev, regulator_names[i]);
|
||||
+// if (IS_ERR(kbdev->regulators[i])) {
|
||||
+// err = PTR_ERR(kbdev->regulators[i]);
|
||||
+// kbdev->regulators[i] = NULL;
|
||||
+// break;
|
||||
+// }
|
||||
+// }
|
||||
+// if (err == -EPROBE_DEFER) {
|
||||
+// while (i > 0)
|
||||
+// regulator_put(kbdev->regulators[--i]);
|
||||
+// return err;
|
||||
+// }
|
||||
+ kbdev->regulators[0] = devm_regulator_get_optional(kbdev->dev, regulator_names[0]);
|
||||
+
|
||||
+ /* Enable regulators during probe to balance the first runtime suspend's
|
||||
+ * regulator_disable() call — mirrors what clocks already do with
|
||||
+ * clk_prepare_enable() below.
|
||||
+ */
|
||||
+ for (i = 0; i < kbdev->nr_regulators; i++) {
|
||||
+ if (kbdev->regulators[i])
|
||||
+ WARN_ON(regulator_enable(kbdev->regulators[i]));
|
||||
+ }
|
||||
#endif
|
||||
|
||||
+ if (IS_ERR(kbdev->regulators[0])) {
|
||||
+ err = PTR_ERR(kbdev->regulators[0]);
|
||||
+ kbdev->regulators[0] = NULL;
|
||||
+ kbdev->nr_regulators = 0;
|
||||
+ } else {
|
||||
+ kbdev->nr_regulators = 1;
|
||||
+
|
||||
+ err = regulator_enable(kbdev->regulators[0]);
|
||||
+ if (err)
|
||||
+ dev_dbg(&pdev->dev, "regulator_enable failed\n");
|
||||
}
|
||||
|
||||
- kbdev->nr_regulators = i;
|
||||
dev_dbg(&pdev->dev, "Regulators probed: %u\n", kbdev->nr_regulators);
|
||||
-#endif
|
||||
+
|
||||
+// #endif
|
||||
|
||||
/* Having more clocks than regulators is acceptable, while the
|
||||
@@ -4731,6 +4740,7 @@
|
||||
#if defined(CONFIG_OF) && defined(CONFIG_REGULATOR)
|
||||
for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
|
||||
if (kbdev->regulators[i]) {
|
||||
+ regulator_disable(kbdev->regulators[i]);
|
||||
regulator_put(kbdev->regulators[i]);
|
||||
kbdev->regulators[i] = NULL;
|
||||
* opposite shall not happen.
|
||||
@@ -4543,30 +4556,55 @@ int power_control_init(struct kbase_device *kbdev)
|
||||
* Any other error is ignored and the driver will continue
|
||||
* operating with a partial initialization of clocks.
|
||||
*/
|
||||
- for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
|
||||
- kbdev->clocks[i] = of_clk_get_by_name(kbdev->dev->of_node, "bus");
|
||||
- if (IS_ERR(kbdev->clocks[i])) {
|
||||
- err = PTR_ERR(kbdev->clocks[i]);
|
||||
- kbdev->clocks[i] = NULL;
|
||||
- break;
|
||||
- }
|
||||
|
||||
- err = clk_prepare_enable(kbdev->clocks[i]);
|
||||
- if (err) {
|
||||
- dev_err(kbdev->dev, "Failed to prepare and enable clock (%d)\n", err);
|
||||
- clk_put(kbdev->clocks[i]);
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- if (err == -EPROBE_DEFER) {
|
||||
- while (i > 0) {
|
||||
- clk_disable_unprepare(kbdev->clocks[--i]);
|
||||
- clk_put(kbdev->clocks[i]);
|
||||
- }
|
||||
- goto clocks_probe_defer;
|
||||
+ kbdev->clocks[0] = devm_clk_get_optional(kbdev->dev, NULL);
|
||||
+ if (!IS_ERR(kbdev->clocks[0]))
|
||||
+ dev_dbg(kbdev->dev, "clk_get: %s\n", __clk_get_name(kbdev->clocks[0]));
|
||||
+ else
|
||||
+ dev_err(kbdev->dev, "clk_get: is NULL");
|
||||
+
|
||||
+ /* if platform device is enabled, disable it now */
|
||||
+ //if (__clk_is_enabled(kbdev->clocks[0])) {
|
||||
+ // clk_disable(kbdev->clocks[0]);
|
||||
+ //}
|
||||
+ /* delete from clk tree */
|
||||
+ //clk_unprepare(kbdev->clocks[0]);
|
||||
+ //clk_put(kbdev->clocks[0]);
|
||||
+
|
||||
+ /* now grab the gpu clock node from device tree definition */
|
||||
+ //kbdev->clocks[0] = of_clk_get_by_name(kbdev->dev->of_node, "gpu");
|
||||
+
|
||||
+ /* we are kinda commited here.. if this fails, the system will lock up */
|
||||
+ err = clk_prepare_enable(kbdev->clocks[0]);
|
||||
+ if (err) {
|
||||
+ dev_err(kbdev->dev, "Failed to prepare and enable clock (%d)\n", err);
|
||||
+ clk_put(kbdev->clocks[0]);
|
||||
}
|
||||
|
||||
- kbdev->nr_clocks = i;
|
||||
+ // for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
|
||||
+ // kbdev->clocks[i] = of_clk_get(kbdev->dev->of_node, (int)i);
|
||||
+ // if (IS_ERR(kbdev->clocks[i])) {
|
||||
+ // err = PTR_ERR(kbdev->clocks[i]);
|
||||
+ // kbdev->clocks[i] = NULL;
|
||||
+ // break;
|
||||
+ // }
|
||||
+
|
||||
+ // err = clk_prepare_enable(kbdev->clocks[i]);
|
||||
+ // if (err) {
|
||||
+ // dev_err(kbdev->dev, "Failed to prepare and enable clock (%d)\n", err);
|
||||
+ // clk_put(kbdev->clocks[i]);
|
||||
+ // break;
|
||||
+ // }
|
||||
+ // }
|
||||
+ // if (err == -EPROBE_DEFER) {
|
||||
+ // while (i > 0) {
|
||||
+ // clk_disable_unprepare(kbdev->clocks[--i]);
|
||||
+ // clk_put(kbdev->clocks[i]);
|
||||
+ // }
|
||||
+ // goto clocks_probe_defer;
|
||||
+ // }
|
||||
+
|
||||
+ kbdev->nr_clocks = 1;
|
||||
dev_dbg(&pdev->dev, "Clocks probed: %u\n", kbdev->nr_clocks);
|
||||
|
||||
/* Any error in parsing the OPP table from the device file
|
||||
diff --git a/product/kernel/drivers/gpu/arm/midgard/platform/meson/mali_kbase_runtime_pm.c b/product/kernel/drivers/gpu/arm/midgard/platform/meson/mali_kbase_runtime_pm.c
|
||||
index bd3b4b5..33a24bb 100644
|
||||
--- a/product/kernel/drivers/gpu/arm/midgard/platform/meson/mali_kbase_runtime_pm.c
|
||||
+++ b/product/kernel/drivers/gpu/arm/midgard/platform/meson/mali_kbase_runtime_pm.c
|
||||
@@ -113,7 +113,8 @@ static void enable_gpu_power_control(struct kbase_device *kbdev)
|
||||
if (WARN_ON(kbdev->clocks[i] == NULL))
|
||||
;
|
||||
else if (!__clk_is_enabled(kbdev->clocks[i]))
|
||||
- WARN_ON(clk_prepare_enable(kbdev->clocks[i]));
|
||||
+ //WARN_ON(clk_prepare_enable(kbdev->clocks[i]));
|
||||
+ ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,8 +126,9 @@ static void disable_gpu_power_control(struct kbase_device *kbdev)
|
||||
if (WARN_ON(kbdev->clocks[i] == NULL))
|
||||
;
|
||||
else if (__clk_is_enabled(kbdev->clocks[i])) {
|
||||
- clk_disable_unprepare(kbdev->clocks[i]);
|
||||
- WARN_ON(__clk_is_enabled(kbdev->clocks[i]));
|
||||
+ //clk_disable_unprepare(kbdev->clocks[i]);
|
||||
+ //WARN_ON(__clk_is_enabled(kbdev->clocks[i]));
|
||||
+ ;
|
||||
}
|
||||
--- a/product/kernel/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c
|
||||
+++ b/product/kernel/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c
|
||||
@@ -38,7 +38,7 @@ static void enable_gpu_power_control(struct kbase_device *kbdev)
|
||||
for (i = 0; i < kbdev->nr_regulators; i++) {
|
||||
}
|
||||
|
||||
@@ -135,7 +137,8 @@ static void disable_gpu_power_control(struct kbase_device *kbdev)
|
||||
if (WARN_ON(kbdev->regulators[i] == NULL))
|
||||
;
|
||||
- else if (!regulator_is_enabled(kbdev->regulators[i]))
|
||||
+ else
|
||||
WARN_ON(regulator_enable(kbdev->regulators[i]));
|
||||
else if (regulator_is_enabled(kbdev->regulators[i]))
|
||||
- WARN_ON(regulator_disable(kbdev->regulators[i]));
|
||||
+ //WARN_ON(regulator_disable(kbdev->regulators[i]));
|
||||
+ ;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user