summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-09-08 18:16:05 +0000
committerAlex Wilson <alex.wilson@joyent.com>2016-09-08 19:00:54 +0000
commit60bdcadec19203eaf6857dfd76ca609f322d1e84 (patch)
tree1cdef3575987054c2e8347c6f0ad5d5f6eb950e4
parentd93feaa582d43152b1d9fe605c90751990f145a8 (diff)
downloadillumos-joyent-60bdcadec19203eaf6857dfd76ca609f322d1e84.tar.gz
OS-5658 USB always identified as xHCI after latest ACPI update
Reviewed by: Alex Wilson <alex.wilson@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Alex Wilson <alex.wilson@joyent.com>
-rw-r--r--usr/src/uts/intel/io/acpica/utilities/utosi.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/usr/src/uts/intel/io/acpica/utilities/utosi.c b/usr/src/uts/intel/io/acpica/utilities/utosi.c
index 674fe364d3..18656fa017 100644
--- a/usr/src/uts/intel/io/acpica/utilities/utosi.c
+++ b/usr/src/uts/intel/io/acpica/utilities/utosi.c
@@ -103,9 +103,19 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] =
{"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */
{"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */
{"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */
- {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8 and Server 2012 - Added 08/2012 */
- {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
- {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10}, /* Windows 10 - Added 03/2015 */
+ /*
+ * XXX
+ * The following OSes are temporarily disabled. Windows introduced
+ * support for xhci (USB 3.0) in Windows 8. When we advertise Windows 8
+ * and newer support, some vendors use that as a key to automatically
+ * transition all USB ports to the xhci controller. Until we have
+ * support for the xhci controller, we should not advertise these
+ * operating systems. From a brief survey, there isn't too much other
+ * AML that this impacts at this time.
+ */
+/* {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8},*/ /* Windows 8 and Server 2012 - Added 08/2012 */
+/* {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8},*/ /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
+/* {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10},*/ /* Windows 10 - Added 03/2015 */
/* Feature Group Strings */