Linux-MIPS Archive on lore.kernel.org
 help / Atom feed
* [PATCH] mips: loongson64: remove unreachable(), fix loongson_poweroff().
@ 2019-02-06  7:07 Yifeng Li
  2019-02-07 19:53 ` Paul Burton
  0 siblings, 1 reply; 2+ messages in thread
From: Yifeng Li @ 2019-02-06  7:07 UTC (permalink / raw)
  To: linux-mips
  Cc: Huacai Chen, Ralf Baechle, Paul Burton, James Hogan, Yifeng Li,
	linux-kernel, Aaro Koskinen

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>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] mips: loongson64: remove unreachable(),  fix loongson_poweroff().
  2019-02-06  7:07 [PATCH] mips: loongson64: remove unreachable(), fix loongson_poweroff() Yifeng Li
@ 2019-02-07 19:53 ` Paul Burton
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Burton @ 2019-02-07 19:53 UTC (permalink / raw)
  To: Yifeng Li
  Cc: linux-mips, Huacai Chen, Ralf Baechle, Paul Burton, James Hogan,
	Yifeng Li, linux-kernel, Aaro Koskinen, linux-mips

Hello,

Yifeng Li wrote:
> 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>

Applied to mips-fixes.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-06  7:07 [PATCH] mips: loongson64: remove unreachable(), fix loongson_poweroff() Yifeng Li
2019-02-07 19:53 ` Paul Burton

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org linux-mips@archiver.kernel.org
	public-inbox-index linux-mips


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/ public-inbox