diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-09-27 17:09:49 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-09-27 17:09:49 +0200 |
| commit | 213042bba186b995bc2f25c8c2d06a9652177fa3 (patch) | |
| tree | f8a12ada9ea2a95e400802e4a6451be7f1178ef7 /nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch | |
| parent | ff1073d03d303d3b15e66d03dc4a5a479a387fa7 (diff) | |
| download | nixturris-213042bba186b995bc2f25c8c2d06a9652177fa3.tar.gz nixturris-213042bba186b995bc2f25c8c2d06a9652177fa3.tar.bz2 nixturris-213042bba186b995bc2f25c8c2d06a9652177fa3.zip | |
Import Turris OS kernel patches
Diffstat (limited to 'nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch')
| -rw-r--r-- | nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch b/nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch deleted file mode 100644 index 527a4f7..0000000 --- a/nixos/modules/kernel-patches/0006-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0ac42f2a36490ee410b7c88720652ded4ec6beff Mon Sep 17 00:00:00 2001 -From: Russell King <rmk+kernel@arm.linux.org.uk> -Date: Sat, 3 Oct 2015 09:13:05 +0100 -Subject: [PATCH 06/10] cpuidle: mvebu: indicate failure to enter deeper sleep - states - -The cpuidle ->enter method expects the return value to be the sleep -state we entered. Returning negative numbers or other codes is not -permissible since coupled CPU idle was merged. - -At least some of the mvebu_v7_cpu_suspend() implementations return the -value from cpu_suspend(), which returns zero if the CPU vectors back -into the kernel via cpu_resume() (the success case), or the non-zero -return value of the suspend actor, or one (failure cases). - -We do not want to be returning the failure case value back to CPU idle -as that indicates that we successfully entered one of the deeper idle -states. Always return zero instead, indicating that we slept for the -shortest amount of time. - -Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> ---- - drivers/cpuidle/cpuidle-mvebu-v7.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c -index 01a856971f05..18ded9e7cb34 100644 ---- a/drivers/cpuidle/cpuidle-mvebu-v7.c -+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c -@@ -39,8 +39,12 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev, - ret = mvebu_v7_cpu_suspend(deepidle); - cpu_pm_exit(); - -+ /* -+ * If we failed to enter the desired state, indicate that we -+ * slept lightly. -+ */ - if (ret) -- return ret; -+ return 0; - - return index; - } --- -2.37.2 - |