Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:05 +0100
commit4642719922e1c7ab35f0b83f1eac2c1cdeb4da73 (patch)
treec474cebe3200ce49e6e4552f6e380285fff03aae
parent507a3065063f6a52082ca9f44f09ba49b8f22b56 (diff)
mips: loongson64: remove unreachable(), fix loongson_poweroff()
-rw-r--r--patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch b/patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch
new file mode 100644
index 0000000000..d0ad8bc88c
--- /dev/null
+++ b/patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch
@@ -0,0 +1,66 @@
+From: Yifeng Li <tomli@tomli.me>
+Date: Wed, 6 Feb 2019 15:07:21 +0800
+Subject: [PATCH] mips: loongson64: remove unreachable(), fix
+ loongson_poweroff().
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: 8a96669d77897ff3613157bf43f875739205d66d
+
+commit 8a96669d77897ff3613157bf43f875739205d66d upstream.
+
+On my Yeeloong 8089, I noticed the machine fails to shutdown
+properly, and often, the function mach_prepare_reboot() is
+unexpectedly executed, thus the machine reboots instead. A
+wait loop is needed to ensure the system is in a well-defined
+state before going down.
+
+In commit 997e93d4df16 ("MIPS: Hang more efficiently on
+halt/powerdown/restart"), a general superset of the wait loop for all
+platforms is already provided, so we don't need to implement our own.
+
+This commit simply removes the unreachable() compiler marco after
+mach_prepare_reboot(), thus allowing the execution of machine_hang().
+My test shows that the machine is now able to shutdown successfully.
+
+Please note that there are two different bugs preventing the machine
+from shutting down, another work-in-progress commit is needed to
+fix a lockup in cpufreq / i8259 driver, please read Reference, this
+commit does not fix that bug.
+
+Reference: https://lkml.org/lkml/2019/2/5/908
+Signed-off-by: Yifeng Li <tomli@tomli.me>
+Signed-off-by: Paul Burton <paul.burton@mips.com>
+Cc: linux-mips@vger.kernel.org
+Cc: Huacai Chen <chenhc@lemote.com>
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: James Hogan <jhogan@kernel.org>
+Cc: linux-kernel@vger.kernel.org
+Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
+Cc: stable@vger.kernel.org # v4.17+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/mips/loongson64/common/reset.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/arch/mips/loongson64/common/reset.c b/arch/mips/loongson64/common/reset.c
+index a60715e11306..b26892ce871c 100644
+--- a/arch/mips/loongson64/common/reset.c
++++ b/arch/mips/loongson64/common/reset.c
+@@ -59,7 +59,12 @@ static void loongson_poweroff(void)
+ {
+ #ifndef CONFIG_LEFI_FIRMWARE_INTERFACE
+ mach_prepare_shutdown();
+- unreachable();
++
++ /*
++ * It needs a wait loop here, but mips/kernel/reset.c already calls
++ * a generic delay loop, machine_hang(), so simply return.
++ */
++ return;
+ #else
+ void (*fw_poweroff)(void) = (void *)loongson_sysconf.poweroff_addr;
+
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 3c7624cd43..0a50d31c9e 100644
--- a/series.conf
+++ b/series.conf
@@ -1109,6 +1109,7 @@
patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch
patches.kernel.org/4.20.9-025-MIPS-OCTEON-don-t-set-octeon_dma_bar_type-if-P.patch
patches.kernel.org/4.20.9-026-MIPS-VDSO-Use-same-m-float-cflag-as-the-kernel.patch
+ patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch
########################################################
# Build fixes that apply to the vanilla kernel too.