| Message ID | 20180314231310.10101-6-erik.schmauss@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
> -----Original Message----- > From: Erik Schmauss [mailto:erik.schmauss@intel.com] > Sent: Thursday, March 15, 2018 7:13 AM > To: rjw@rjwysocki.net > Cc: linux-acpi@vger.kernel.org; Limonciello, Mario <Mario_Limonciello@Dell.com>; > Erik Schmauss <erik.schmauss@intel.com> > Subject: [PATCH 05/15] ACPICA: Recognize the _OSI string "Windows 2017.2" > > From: Mario Limonciello <mario.limonciello@dell.com> > > Dell uses this string to activate Thunderbolt native mode on supported > machines. > > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> > Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> > --- > drivers/acpi/acpica/utosi.c | 1 + > include/acpi/actypes.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c > index 00ea104f6a0a..47e5234754f3 100644 > --- a/drivers/acpi/acpica/utosi.c > +++ b/drivers/acpi/acpica/utosi.c > @@ -103,6 +103,7 @@ static struct acpi_interface_info > acpi_default_supported_interfaces[] = { > {"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 */ > + {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 > version 1709 - Added 02/2018 */ > > /* Feature Group Strings */ > > diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h > index a894ea13dcba..517d1c49853b 100644 > --- a/include/acpi/actypes.h > +++ b/include/acpi/actypes.h > @@ -1304,6 +1304,7 @@ typedef enum { > #define ACPI_OSI_WIN_10 0x0D > #define ACPI_OSI_WIN_10_RS1 0x0E > #define ACPI_OSI_WIN_10_RS2 0x0F > +#define ACPI_OSI_WIN_10_RS3 0x10 > > /* Definitions of getopt */ > > -- > 2.14.3 Mika, Just to confirm your acpiphp fixes were accepted or not? I wasn't sure which tree they should be coming in. I'd like to make sure that they're targeted at the same merge window as this patch. Thanks, -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 15, 2018 at 12:44:50AM +0000, Mario.Limonciello@dell.com wrote: > Just to confirm your acpiphp fixes were accepted or not? I wasn't sure > which tree they should be coming in. I'd like to make sure > that they're targeted at the same merge window as this patch. I haven't got any feedback from Bjorn regarding the patches but he haven't merged them either. I'll ping him. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday, March 15, 2018 6:56:36 AM CET Mika Westerberg wrote: > On Thu, Mar 15, 2018 at 12:44:50AM +0000, Mario.Limonciello@dell.com wrote: > > Just to confirm your acpiphp fixes were accepted or not? I wasn't sure > > which tree they should be coming in. I'd like to make sure > > that they're targeted at the same merge window as this patch. > > I haven't got any feedback from Bjorn regarding the patches but he > haven't merged them either. I'll ping him. Thanks for the heads-up! I'll defer applying this patch until we have all of the requisite material in the Linus' tree. Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c index 00ea104f6a0a..47e5234754f3 100644 --- a/drivers/acpi/acpica/utosi.c +++ b/drivers/acpi/acpica/utosi.c @@ -103,6 +103,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { {"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 */ + {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 version 1709 - Added 02/2018 */ /* Feature Group Strings */ diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index a894ea13dcba..517d1c49853b 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -1304,6 +1304,7 @@ typedef enum { #define ACPI_OSI_WIN_10 0x0D #define ACPI_OSI_WIN_10_RS1 0x0E #define ACPI_OSI_WIN_10_RS2 0x0F +#define ACPI_OSI_WIN_10_RS3 0x10 /* Definitions of getopt */