From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752606AbdLKO7R (ORCPT <rfc822;w@1wt.eu>);
        Mon, 11 Dec 2017 09:59:17 -0500
Received: from mga14.intel.com ([192.55.52.115]:32376 "EHLO mga14.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752573AbdLKO7Q (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 11 Dec 2017 09:59:16 -0500
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.45,392,1508828400"; 
   d="scan'208";a="569296"
Subject: Re: [PATCH] Fix resume on x86-32 machines
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Pavel Machek <pavel@ucw.cz>,
        Andrew Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Zhang Rui <rui.zhang@intel.com>, Thomas Gleixner <tglx@linutronix.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        the arch/x86 maintainers <x86@kernel.org>
References: <2809506.pL8kVbvXcY@aspire.rjw.lan> <20171210213804.GA4660@amd>
 <76028A95-1CE1-49AA-9929-9C15FFC520EB@amacapital.net>
 <151331264.Sjvx2oHGGq@aspire.rjw.lan>
From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Message-ID: <2dd7f763-9926-7f36-f2bc-6df72fa798ce@linux.intel.com>
Date: Mon, 11 Dec 2017 16:59:11 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <151331264.Sjvx2oHGGq@aspire.rjw.lan>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/11/2017 04:22 PM, Rafael J. Wysocki wrote:
> On Sunday, December 10, 2017 10:58:23 PM CET Andy Lutomirski wrote:
>>
>>> On Dec 10, 2017, at 1:38 PM, Pavel Machek <pavel@ucw.cz> wrote:
>>>
>>>
>>> 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.
>>>
>>
>> Can you explain what was wrong with the reordering?  Your patch certainly *looks* incorrect.
>>
>> I'm guessing that the real issue is that 32-bit needs %fs restored early for TLS.
> 
> I *think* you are right.
> 
> Anyway, that should be easy enough to verify.
> 
> Pavel, can you please check if the below change works too?
> 
> ---
>   arch/x86/power/cpu.c |    3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
Works here on my test machine.

Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>