From patchwork Wed Sep 24 14:01:09 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1287 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7A00CDE400 for ; Thu, 25 Sep 2008 00:02:19 +1000 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from sipsolutions.net (xc.sipsolutions.net [83.246.72.84]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7FEEDDDF3A for ; Thu, 25 Sep 2008 00:02:06 +1000 (EST) Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1KiUwC-00068x-CB; Wed, 24 Sep 2008 16:02:02 +0200 Subject: [PATCH] powerpc: fix 64-bit hibernation with 64k pages From: Johannes Berg To: linuxppc-dev list Date: Wed, 24 Sep 2008 16:01:09 +0200 Message-Id: <1222264869.4257.13.camel@johannes.berg> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Brown paper bag patch, the fact that it didn't work is entirely my fault for hardcoding 512 in the original patch. Signed-off-by: Johannes Berg --- Contains the revert for the earlier patch just in case; probably better to not apply the earlier patch and only the first hunk of this. --- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/swsusp_asm64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- wireless-testing.orig/arch/powerpc/kernel/swsusp_asm64.S 2008-09-24 15:32:07.119071976 +0200 +++ wireless-testing/arch/powerpc/kernel/swsusp_asm64.S 2008-09-24 15:32:15.723824535 +0200 @@ -133,7 +133,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) cmpdi r12,0 beq- nothing_to_copy - li r15,512 + li r15,PAGE_SIZE>>3 copyloop: ld r13,pbe_address(r12) ld r14,pbe_orig_address(r12) --- wireless-testing.orig/arch/powerpc/Kconfig 2008-09-24 15:32:36.483825650 +0200 +++ wireless-testing/arch/powerpc/Kconfig 2008-09-24 15:32:42.837826811 +0200 @@ -194,7 +194,7 @@ config HIBERNATE_32 config HIBERNATE_64 bool - depends on BROKEN || (PPC_PMAC64 && !PPC_64K_PAGES && EXPERIMENTAL) + depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL) default y config ARCH_HIBERNATION_POSSIBLE