From c08bf025f7609d535e806787d9a1f12f4b33f17e Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 10 May 2020 12:27:32 +0200 Subject: [PATCH] Revert "sb/intel/common/acpi: Add more Windows versions" This reverts commit cc805d9dd64ca2d3c8de2b2de2ea7c53b387ff8f. Advertising certain Windows versions triggers different paths in the OS. As there may also be device specific quirks in the OS, such changes need to be tested thoroughly on all affected devices. There was at least one very subtle regression introduced by this. When Linux sees "Windows 2012" support advertised, it disables the `acpi_video` backlight controls, at least on devices with Intel IGD. Without user-space handling the ACPI events, keyboard backlight controls stop working. Moreover, the commit message didn't state any reason for this change. Why was it merged? Change-Id: I722075f8e8f836b039fb8b8277e665fb49dac8f4 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/41192 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- .../intel/common/acpi/platform.asl | 34 ++----------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/southbridge/intel/common/acpi/platform.asl b/src/southbridge/intel/common/acpi/platform.asl index b92872920c..2786d93ec5 100644 --- a/src/southbridge/intel/common/acpi/platform.asl +++ b/src/southbridge/intel/common/acpi/platform.asl @@ -47,16 +47,10 @@ Method(GOS, 0) * OSYS value | Operating System * -----------+------------------ * 2000 | Windows 2000 - * 2001 | Windows XP - * 2001 | Windows XP SP1 - * 2001 | Windows Server 2003 - * 2001 | Windows Server 2003 SP1 + * 2001 | Windows XP(+SP1) * 2002 | Windows XP SP2 * 2006 | Windows Vista - * 2006 | Windows Vista SP1 - * 2006 | Windows Server 2008 - * 2009 | Windows 7 - * 2012 | Windows 8 + * ???? | Windows 7 */ /* Let's assume we're running at least Windows 2000 */ @@ -71,14 +65,6 @@ Method(GOS, 0) Store (2001, OSYS) } - If (_OSI("Windows 2001.1")) { - Store (2001, OSYS) - } - - If (_OSI("Windows 2001.1 SP1")) { - Store (2001, OSYS) - } - If (_OSI("Windows 2001 SP2")) { Store (2002, OSYS) } @@ -86,21 +72,5 @@ Method(GOS, 0) If (_OSI("Windows 2006")) { Store (2006, OSYS) } - - If (_OSI("Windows 2006 SP1")) { - Store (2006, OSYS) - } - - If (_OSI("Windows 2006.1")) { - Store (2006, OSYS) - } - - If (_OSI("Windows 2009")) { - Store (2009, OSYS) - } - - If (_OSI("Windows 2012")) { - Store (2012, OSYS) - } } }