Re: [BUG] MIPS: Hibernation in the latest linux-mips:master branch not work

[Ralf Baechle <ralf@linux-mips.org>]

On Tue, Jun 30, 2009 at 11:11:27PM +0800, Wu Zhangjin wrote:

> hi, ralf, in the latest master branch of linux-mips git repo, seems
> there is a need to select the SYS_SUPPORTS_HOTPLUG_CPU option in every
> uni-processor board, otherwise, the suspend/hibernation can not be used,
> because you have set:
> 
> config ARCH_HIBERNATION_POSSIBLE
>     def_bool y
>     depends on SYS_SUPPORTS_HOTPLUG_CPU
> 
> config ARCH_SUSPEND_POSSIBLE
>     def_bool y
>     depends on SYS_SUPPORTS_HOTPLUG_CPU
> 
> so, the board-specific patch must be pushed by the maintainers of
> boards. and if the board support SMP, they must implement the
> mips-specific hotplug support, is this right? I have selected
> SYS_SUPPORTS_HOTPLUG_CPU in LEMOTE_FULONG and will push a relative patch
> later.

I think below patch should take care of this problem.  It simply assumes
that all uniprocessor systems support suspend and hibernate.  That's an
assumption that I'm not to unhappy with though it may force us to fix a
few systems.

  Ralf

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

 arch/mips/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index df1a92a..3ca0fe1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2168,11 +2168,11 @@ menu "Power management options"
 
 config ARCH_HIBERNATION_POSSIBLE
 	def_bool y
-	depends on SYS_SUPPORTS_HOTPLUG_CPU
+	depends on SYS_SUPPORTS_HOTPLUG_CPU || !SMP
 
 config ARCH_SUSPEND_POSSIBLE
 	def_bool y
-	depends on SYS_SUPPORTS_HOTPLUG_CPU
+	depends on SYS_SUPPORTS_HOTPLUG_CPU || !SMP
 
 source "kernel/power/Kconfig"