On 12/11/20 9:16 AM, Bruce Ashfield wrote:
On Fri, Dec 11, 2020 at 9:48 AM Joshua Watt <[email protected]> wrote:
Fixes the serial port output stopping mid way through the boot process
by reverting the kernel commit that caused it.
If you want, I can also pick this up and merge it directly into
linux-yocto and do a SRCREV bump.
Have you tested against 5.10 ? I'm working through issues with it now,
and it would be nice to fix this before it pops up again on the next
reference kernel bump.
When I use `linux-yocto-dev` as the kernel provider, it works just fine
(in fact, I can't seem to find the commit that *fixes* the problem
there....), so I think 5.10 will be OK? Is there something else I should
try instead?
I'm not sure if we want to backport it to linux-yocto or not... I
presume upstream backported it because it fixed something, so I'd be a
little worried about a regression somewhere else.
Cheers,
Bruce
Signed-off-by: Joshua Watt <[email protected]>
---
...-resolve-supply-after-creating-regul.patch | 53 +++++++++++++++++++
recipes-kernel/linux/linux-yocto_5.8.bbappend | 4 ++
2 files changed, 57 insertions(+)
create mode 100644
recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
create mode 100644 recipes-kernel/linux/linux-yocto_5.8.bbappend
diff --git
a/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
b/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
new file mode 100644
index 0000000..3dd336b
--- /dev/null
+++
b/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
@@ -0,0 +1,53 @@
+From a414d39b848002e15531f2538d2b6427ce51d07d Mon Sep 17 00:00:00 2001
+From: Joshua Watt <[email protected]>
+Date: Thu, 10 Dec 2020 15:59:47 -0600
+Subject: [PATCH] Revert "regulator: resolve supply after creating regulator"
+
+This commit prevents the serial console from working on the Rock Pi 4
+for some reason. It *appears* to possibly be fixed by some other commit
+upstream, but after a lot of head scratching and bisecting, I was unable
+to find which one, so just revert it for now and we can deal with it
+later.
+
+This reverts commit 96c6b5d5775637b3095ef934f871044811fd4db7.
+
+---
+ drivers/regulator/core.c | 21 ++++++++-------------
+ 1 file changed, 8 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
+index 25e601bf9383..be8c709a7488 100644
+--- a/drivers/regulator/core.c
++++ b/drivers/regulator/core.c
+@@ -5187,20 +5187,15 @@ regulator_register(const struct regulator_desc
*regulator_desc,
+ else if (regulator_desc->supply_name)
+ rdev->supply_name = regulator_desc->supply_name;
+
++ /*
++ * Attempt to resolve the regulator supply, if specified,
++ * but don't return an error if we fail because we will try
++ * to resolve it again later as more regulators are added.
++ */
++ if (regulator_resolve_supply(rdev))
++ rdev_dbg(rdev, "unable to resolve supply\n");
++
+ ret = set_machine_constraints(rdev, constraints);
+- if (ret == -EPROBE_DEFER) {
+- /* Regulator might be in bypass mode and so needs its supply
+- * to set the constraints */
+- /* FIXME: this currently triggers a chicken-and-egg problem
+- * when creating -SUPPLY symlink in sysfs to a regulator
+- * that is just being created */
+- ret = regulator_resolve_supply(rdev);
+- if (!ret)
+- ret = set_machine_constraints(rdev, constraints);
+- else
+- rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
+- ERR_PTR(ret));
+- }
+ if (ret < 0)
+ goto wash;
+
+--
+2.29.2
+
diff --git a/recipes-kernel/linux/linux-yocto_5.8.bbappend
b/recipes-kernel/linux/linux-yocto_5.8.bbappend
new file mode 100644
index 0000000..5a31842
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto_5.8.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_rock-pi-4 = "
file://0001-Revert-regulator-resolve-supply-after-creating-regul.patch"
+
--
2.29.2
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#51723): https://lists.yoctoproject.org/g/yocto/message/51723
Mute This Topic: https://lists.yoctoproject.org/mt/78880315/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
