Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752176AbdLJViN (ORCPT ); Sun, 10 Dec 2017 16:38:13 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:53782 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbdLJViH (ORCPT ); Sun, 10 Dec 2017 16:38:07 -0500 Date: Sun, 10 Dec 2017 22:38:05 +0100 From: Pavel Machek To: Linus Torvalds Cc: Zhang Rui , Andrew Lutomirski , Thomas Gleixner , Jarkko Nikula , "Rafael J. Wysocki" , Linux Kernel Mailing List , the arch/x86 maintainers Subject: [PATCH] Fix resume on x86-32 machines Message-ID: <20171210213804.GA4660@amd> References: <2809506.pL8kVbvXcY@aspire.rjw.lan> <1578405.51lzoSX1jh@aspire.rjw.lan> <20171209103325.GA13867@amd> <20171209220110.GA11496@amd> <20171210162305.GA10159@amd> <20171210185638.GA10363@amd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="k1lZvvs/B4yU6o8G" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2483 Lines: 90 --k1lZvvs/B4yU6o8G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable After 4.15-rc2, suspend stopped working on Thinkpad X60. 5b06bbc (unintentionally?) reordered stuff with respect to fix_processor_context() on 32-bit and 64-bit. We undo that change on 32-bit. While we are at it, fix a comment. Signed-off-by: Pavel Machek Fixes: 5b06bbcfc2c621da3009da8decb7511500c293ed diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 5191de1..af7b613 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -216,8 +216,8 @@ static void notrace __restore_processor_state(struct sa= ved_context *ctxt) write_cr0(ctxt->cr0); =20 /* - * now restore the descriptor tables to their proper values - * ltr is done i fix_processor_context(). + * Now restore the descriptor tables to their proper values + * ltr is done in fix_processor_context(). */ #ifdef CONFIG_X86_32 load_idt(&ctxt->idt); @@ -235,13 +235,11 @@ static void notrace __restore_processor_state(struct = saved_context *ctxt) wrmsrl(MSR_GS_BASE, ctxt->gs_base); #endif =20 - fix_processor_context(); - +#ifdef CONFIG_X86_32 /* - * Restore segment registers. This happens after restoring the GDT - * and LDT, which happen in fix_processor_context(). + * Restore segment registers. */ -#ifdef CONFIG_X86_32 + loadsegment(es, ctxt->es); loadsegment(fs, ctxt->fs); loadsegment(gs, ctxt->gs); @@ -252,8 +250,17 @@ static void notrace __restore_processor_state(struct s= aved_context *ctxt) */ if (boot_cpu_has(X86_FEATURE_SEP)) enable_sep_cpu(); + + fix_processor_context(); #else /* CONFIG_X86_64 */ + /* + * Restore segment registers. This happens after restoring the GDT + * and LDT, which happen in fix_processor_context(). + */ +=09 + fix_processor_context(); + asm volatile ("movw %0, %%ds" :: "r" (ctxt->ds)); asm volatile ("movw %0, %%es" :: "r" (ctxt->es)); asm volatile ("movw %0, %%fs" :: "r" (ctxt->fs)); --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --k1lZvvs/B4yU6o8G Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlotqTwACgkQMOfwapXb+vJ7dwCffPAI8P7PeT9RFSRTY7EgZc5k jlUAnRrfVbp/7aCRStQcjjx/+v+hgy/5 =r4dB -----END PGP SIGNATURE----- --k1lZvvs/B4yU6o8G--