summaryrefslogtreecommitdiffstats
path: root/sys/x86
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2015-09-16 01:44:11 +0000
committeradrian <adrian@FreeBSD.org>2015-09-16 01:44:11 +0000
commit1b75a44eb37ee51b6ae6e06286bd87b446bc6ffe (patch)
treedb697033218e38e7d1fc362a381b48626d4403f4 /sys/x86
parent20a60726620cd0f57ec053a894faa2a82d9d2141 (diff)
downloadFreeBSD-src-1b75a44eb37ee51b6ae6e06286bd87b446bc6ffe.zip
FreeBSD-src-1b75a44eb37ee51b6ae6e06286bd87b446bc6ffe.tar.gz
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
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/acpica/madt.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 9b99651..62554bd 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);
}
OpenPOWER on IntegriCloud