From owner-svn-src-head@FreeBSD.ORG  Wed Feb 25 16:44:08 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22DACFEE;
 Wed, 25 Feb 2015 16:44:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E873FDC;
 Wed, 25 Feb 2015 16:44:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PGi79D001236;
 Wed, 25 Feb 2015 16:44:07 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PGi7sk001235;
 Wed, 25 Feb 2015 16:44:07 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201502251644.t1PGi7sk001235@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 25 Feb 2015 16:44:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279286 - head/sys/x86/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Feb 2015 16:44:08 -0000

Author: kib
Date: Wed Feb 25 16:44:07 2015
New Revision: 279286
URL: https://svnweb.freebsd.org/changeset/base/279286

Log:
  For now, disable x2APIC mode when Xen is detected, even if CPU
  declares support for it.  Newer versions of Xen works fine with x2APIC
  code, but e.g. Xen 4.2 delivers GPF on the LAPIC MSR write, despite
  x2APIC mode being known to hypervisor.
  
  Discussed with:	royger
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/x86/acpica/madt.c

Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c	Wed Feb 25 16:36:44 2015	(r279285)
+++ head/sys/x86/acpica/madt.c	Wed Feb 25 16:44:07 2015	(r279286)
@@ -158,6 +158,8 @@ madt_setup_local(void)
 					printf(
        "x2APIC available but disabled inside VMWare without intr redirection\n");
 			}
+		} else if (vm_guest == VM_GUEST_XEN) {
+			x2apic_mode = 0;
 		}
 		TUNABLE_INT_FETCH("hw.x2apic_enable", &x2apic_mode);
 	}