From owner-svn-src-all@freebsd.org  Wed Sep 16 01:44:12 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F14E9CD4D5;
 Wed, 16 Sep 2015 01:44:12 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 7DD161E85;
 Wed, 16 Sep 2015 01:44:12 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8G1iCiZ010933;
 Wed, 16 Sep 2015 01:44:12 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8G1iCR7010932;
 Wed, 16 Sep 2015 01:44:12 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201509160144.t8G1iCR7010932@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 16 Sep 2015 01:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287841 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2015 01:44:12 -0000

Author: adrian
Date: Wed Sep 16 01:44:11 2015
New Revision: 287841
URL: https://svnweb.freebsd.org/changeset/base/287841

Log:
  Add ASUS Sandybridge laptops to the similar x2apic disable logic
  that was recently added for Lenovo laptops.
  
  This is a prime candidate for conversion into a table and also
  checking other fields like "product".
  
  Tested:
  
  * ASUS UX31E

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

Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c	Wed Sep 16 00:45:48 2015	(r287840)
+++ head/sys/x86/acpica/madt.c	Wed Sep 16 01:44:11 2015	(r287841)
@@ -182,7 +182,19 @@ madt_setup_local(void)
 			    CPUID_TO_FAMILY(cpu_id) == 0x6 &&
 			    CPUID_TO_MODEL(cpu_id) == 0x2a) {
 				x2apic_mode = 0;
-		reason = "for a suspected Lenovo SandyBridge BIOS bug";
+				reason =
+				    "for a suspected Lenovo SandyBridge BIOS bug";
+			}
+			/*
+			 * Same reason, ASUS SandyBridge.
+			 */
+			if (hw_vendor != NULL &&
+			    !strcmp(hw_vendor, "ASUSTeK Computer Inc.") &&
+			    CPUID_TO_FAMILY(cpu_id) == 0x6 &&
+			    CPUID_TO_MODEL(cpu_id) == 0x2a) {
+				x2apic_mode = 0;
+				reason =
+				    "for a suspected ASUS SandyBridge BIOS bug";
 			}
 			freeenv(hw_vendor);
 		}