svn commit: r287841 - head/sys/x86/acpica

[Adrian Chadd]

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);
 		}