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 S1753551AbbBMPrV (ORCPT <rfc822;w@1wt.eu>);
	Fri, 13 Feb 2015 10:47:21 -0500
Received: from 8bytes.org ([81.169.241.247]:58333 "EHLO theia.8bytes.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752853AbbBMPrT (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 13 Feb 2015 10:47:19 -0500
Date: Fri, 13 Feb 2015 16:47:16 +0100
From: Joerg Roedel <joro@8bytes.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Jiang Liu <jiang.liu@linux.intel.com>, Ingo Molnar <mingo@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>,
        Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] x86/apic updates for v3.20
Message-ID: <20150213154716.GG29106@8bytes.org>
References: <20150209091544.GA4177@gmail.com>
 <CA+55aFw-Ly4xB91TPVW9w3YWL0eS96FqH2BngzeBpqtXBh_Zmw@mail.gmail.com>
 <2495969.f1SBuodJtC@vostro.rjw.lan>
 <CA+55aFyQQ_nRmguHWoVVBOWQduunQfxoBCgDE0a2gU=_5jo2JQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+55aFyQQ_nRmguHWoVVBOWQduunQfxoBCgDE0a2gU=_5jo2JQ@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Feb 12, 2015 at 06:08:45PM -0800, Linus Torvalds wrote:
> Any ideas? The Pixel Chromebook does have an odd and often broken
> BIOS/firmware thing, but it *used* to suspend and resume very reliably
> once we got around its insane TPM thing.

Hmm, looking at the patch and the surrounding code my guess is that
x2apic gets enabled now with 5fcee53ce705 on your Chromebook Pixel at
boot, which causes the suspend issue later for other reasons.

So the condition should rather look like this to keep x2apic disabled
like before:

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index b665d24..770a0bb 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1580,8 +1580,8 @@ static __init void try_to_enable_x2apic(int remap_mode)
 		 * under KVM
 		 */
 		if (max_physical_apicid > 255 ||
-		    (IS_ENABLED(CONFIG_HYPERVISOR_GUEST) &&
-		     !hypervisor_x2apic_available())) {
+		    !(IS_ENABLED(CONFIG_HYPERVISOR_GUEST) &&
+		      hypervisor_x2apic_available())) {
 			pr_info("x2apic: IRQ remapping doesn't support X2APIC mode\n");
 			x2apic_disable();
 			return;

Another solution would be to just revert 5fcee53ce705. This code is not
in any fast-path, so we can live well without that optimization.


	Joerg