diff mbox

[Bisected] 3.7-rc1 can't resume

Message ID 50800F8C.10600@zytor.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

H. Peter Anvin Oct. 18, 2012, 2:17 p.m. UTC 
On 10/18/2012 05:26 AM, Cédric Godin wrote:
> Hello,
>
> After upgrading my kernel from 3.6 to 3.7-rc1 on my laptop, I can't resume anymore.
> I bisected the problem to
>

There is a fix for this already queued up.  Please try the attached 
patch to verify that it fixes your problem.

	-hpa

Comments

Cédric Godin Oct. 19, 2012, 7:10 a.m. UTC | #1 
On 10/18/2012 04:17 PM, H. Peter Anvin wrote:
> On 10/18/2012 05:26 AM, Cédric Godin wrote:
>> Hello,
>>
>> After upgrading my kernel from 3.6 to 3.7-rc1 on my laptop, I can't resume anymore.
>> I bisected the problem to
>>
>
> There is a fix for this already queued up.  Please try the attached patch to verify that it fixes your problem.
>
>     -hpa
>
Hi Peter,

Indeed it fixes my problem.
Many thanks for the quick answer.

Cedric
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

From 1396adc3c2bdc556d4cdd1cf107aa0b6d59fbb1e Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 1 Oct 2012 14:34:42 -0700
Subject: [PATCH] x86, suspend: Correct the restore of CR4, EFER; skip
 computing EFLAGS.ID

The patch:

    73201dbe x86, suspend: On wakeup always initialize cr4 and EFER

... was incorrectly committed in an intermediate (unfinished) form.

- We need to test CF, not ZF, for a bit test with btl.
- We don't actually need to compute the existence of EFLAGS.ID,
  since we set a flag at suspend time if CR4 should be restored.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Link: http://lkml.kernel.org/r/1348529239-17943-1-git-send-email-hpa@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/realmode/rm/wakeup_asm.S | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
index e56479e..9e7e147 100644
--- a/arch/x86/realmode/rm/wakeup_asm.S
+++ b/arch/x86/realmode/rm/wakeup_asm.S
@@ -74,18 +74,9 @@  ENTRY(wakeup_start)
 
 	lidtl	wakeup_idt
 
-	/* Clear the EFLAGS but remember if we have EFLAGS.ID */
-	movl $X86_EFLAGS_ID, %ecx
-	pushl %ecx
-	popfl
-	pushfl
-	popl %edi
+	/* Clear the EFLAGS */
 	pushl $0
 	popfl
-	pushfl
-	popl %edx
-	xorl %edx, %edi
-	andl %ecx, %edi		/* %edi is zero iff CPUID & %cr4 are missing */
 
 	/* Check header signature... */
 	movl	signature, %eax
@@ -120,12 +111,12 @@  ENTRY(wakeup_start)
 	movl	%eax, %cr3
 
 	btl	$WAKEUP_BEHAVIOR_RESTORE_CR4, %edi
-	jz	1f
+	jnc	1f
 	movl	pmode_cr4, %eax
 	movl	%eax, %cr4
 1:
 	btl	$WAKEUP_BEHAVIOR_RESTORE_EFER, %edi
-	jz	1f
+	jnc	1f
 	movl	pmode_efer, %eax
 	movl	pmode_efer + 4, %edx
 	movl	$MSR_EFER, %ecx
-- 
1.7.11.7