RE: [PATCH AUTOSEL for 4.15 050/124] ACPICA: Recognize the Windows 10 version 1607 and 1703 OSI strings

Mario.Limonciello
2018-03-26T09:23:15Z

> -----Original Message-----
> From: Sasha Levin [mailto:Alexander.Levin@microsoft.com]
> Sent: Monday, March 19, 2018 10:48 AM
> To: linux-kernel@vger.kernel.org; stable@vger.kernel.org
> Cc: Limonciello, Mario <Mario_Limonciello@Dell.com>; Bob Moore
> <robert.moore@intel.com>; Erik Schmauss <erik.schmauss@intel.com>; Rafael J .
> Wysocki <rafael.j.wysocki@intel.com>; Sasha Levin
> <Alexander.Levin@microsoft.com>
> Subject: [PATCH AUTOSEL for 4.15 050/124] ACPICA: Recognize the Windows 10
> version 1607 and 1703 OSI strings
>
> From: Mario Limonciello <mario.limonciello@dell.com>
>
> [ Upstream commit bc4d413a819f9d0764a80a55875a5d7e1f4efed4 ]
>
> ACPICA commit 35a4a3ea723b3066f575e63e5f0116f7ce65e713
>
> The public Microsoft document listing recognized OSI strings [1]
> shows that these two strings were introduced.
> version 1607 / Anniversary Update / "Redstone 1"
> version 1703 / Creators Update / "Redstone 2"
>
> [1] http://download.microsoft.com/download/7/e/7/7e7662cf-cbea-470b-a97e-
> ce7ce0d98dc2/winacpi_osi.docx
>
> Link: https://github.com/acpica/acpica/commit/35a4a3ea
> Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
> Signed-off-by: Bob Moore <robert.moore@intel.com>
> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
> ---
> drivers/acpi/acpica/utosi.c | 2 ++
> include/acpi/actypes.h | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
> index 3175b133c0e4..f6b8dd24b006 100644
> --- a/drivers/acpi/acpica/utosi.c
> +++ b/drivers/acpi/acpica/utosi.c
> @@ -101,6 +101,8 @@ static struct acpi_interface_info
> acpi_default_supported_interfaces[] = {
> {"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 */
> + {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10
> version 1607 - Added 12/2017 */
> + {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10
> version 1703 - Added 12/2017 */
>
> /* Feature Group Strings */
>
> diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
> index 4f077edb9b81..bfc8a814379a 100644
> --- a/include/acpi/actypes.h
> +++ b/include/acpi/actypes.h
> @@ -1299,6 +1299,8 @@ typedef enum {
> #define ACPI_OSI_WIN_7 0x0B
> #define ACPI_OSI_WIN_8 0x0C
> #define ACPI_OSI_WIN_10 0x0D
> +#define ACPI_OSI_WIN_10_RS1 0x0E
> +#define ACPI_OSI_WIN_10_RS2 0x0F
>
> /* Definitions of getopt */
>
> --
> 2.14.1

This is fine by me for 4.15, as mentioned in other email I don't think it should go to 4.14, 4.9 or 4.4.