From a14bc739d57a02ef2710db8b66e4ee9120a2a43a Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 16 Sep 2015 01:44:11 +0000
Subject: [PATCH] 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
---
 sys/x86/acpica/madt.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 9b99651c3c60..62554bdad4a7 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -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);
 		}