From aaa9f17c36a3aa682102a79f020c8334b51ae33e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Dec 2019 15:12:36 +0100 Subject: [PATCH] 4.9-stable patches added patches: revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch --- ...tion-for-a-while-after-late_initcall.patch | 89 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 90 insertions(+) create mode 100644 queue-4.9/revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch diff --git a/queue-4.9/revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch b/queue-4.9/revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch new file mode 100644 index 00000000000..ddb6102dce6 --- /dev/null +++ b/queue-4.9/revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch @@ -0,0 +1,89 @@ +From 21f45484a7d1cbfde5f0af2fb9491dda3ba43489 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 18 Dec 2019 15:10:24 +0100 +Subject: Revert "regulator: Defer init completion for a while after late_initcall" + +From: Greg Kroah-Hartman + +This reverts commit 8b8c8d69b1a31004517d4c71a490f47bdf3405a2 which is +commit 55576cf1853798e86f620766e23b604c9224c19c upstream. + +It's causing "odd" interactions with older kernels, so it probably isn't +a good idea to cause timing changes there. This has been reported to +cause oopses on Pixel devices. + +Reported-by: Siddharth Kapoor +Cc: Mark Brown +Cc: Lee Jones +Signed-off-by: Greg Kroah-Hartman +--- + drivers/regulator/core.c | 42 +++++++++++------------------------------- + 1 file changed, 11 insertions(+), 31 deletions(-) + +--- a/drivers/regulator/core.c ++++ b/drivers/regulator/core.c +@@ -4452,7 +4452,7 @@ static int __init regulator_init(void) + /* init early to allow our consumers to complete system booting */ + core_initcall(regulator_init); + +-static int regulator_late_cleanup(struct device *dev, void *data) ++static int __init regulator_late_cleanup(struct device *dev, void *data) + { + struct regulator_dev *rdev = dev_to_rdev(dev); + const struct regulator_ops *ops = rdev->desc->ops; +@@ -4501,9 +4501,18 @@ unlock: + return 0; + } + +-static void regulator_init_complete_work_function(struct work_struct *work) ++static int __init regulator_init_complete(void) + { + /* ++ * Since DT doesn't provide an idiomatic mechanism for ++ * enabling full constraints and since it's much more natural ++ * with DT to provide them just assume that a DT enabled ++ * system has full constraints. ++ */ ++ if (of_have_populated_dt()) ++ has_full_constraints = true; ++ ++ /* + * Regulators may had failed to resolve their input supplies + * when were registered, either because the input supply was + * not registered yet or because its parent device was not +@@ -4520,35 +4529,6 @@ static void regulator_init_complete_work + */ + class_for_each_device(®ulator_class, NULL, NULL, + regulator_late_cleanup); +-} +- +-static DECLARE_DELAYED_WORK(regulator_init_complete_work, +- regulator_init_complete_work_function); +- +-static int __init regulator_init_complete(void) +-{ +- /* +- * Since DT doesn't provide an idiomatic mechanism for +- * enabling full constraints and since it's much more natural +- * with DT to provide them just assume that a DT enabled +- * system has full constraints. +- */ +- if (of_have_populated_dt()) +- has_full_constraints = true; +- +- /* +- * We punt completion for an arbitrary amount of time since +- * systems like distros will load many drivers from userspace +- * so consumers might not always be ready yet, this is +- * particularly an issue with laptops where this might bounce +- * the display off then on. Ideally we'd get a notification +- * from userspace when this happens but we don't so just wait +- * a bit and hope we waited long enough. It'd be better if +- * we'd only do this on systems that need it, and a kernel +- * command line option might be useful. +- */ +- schedule_delayed_work(®ulator_init_complete_work, +- msecs_to_jiffies(30000)); + + return 0; + } diff --git a/queue-4.9/series b/queue-4.9/series index b00bcef375b..262e1af5f36 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -182,3 +182,4 @@ inet-protect-against-too-small-mtu-values.patch tcp-fix-rejected-syncookies-due-to-stale-timestamps.patch tcp-tighten-acceptance-of-acks-not-matching-a-child-socket.patch tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch +revert-regulator-defer-init-completion-for-a-while-after-late_initcall.patch -- 2.47.3