Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI / osi: Cleanup _OSI("Linux") related code before introducing new support

Browse Source 
This patch cleans up OSI code in osl.c to make osi_linux work for OSI
strings other than "Linux", so it can be re-used for other purposes.

Tested-by: Lukas Wunner <lukas@wunner.de>
Tested-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2016-05-03 16:48:27 +08:00 committed by Rafael J. Wysocki
parent 30c9bb0d76
commit dbee890bf6
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/acpi/osl.c
View File

@ -131,12 +131,12 @@ static void __init acpi_osi_setup_late(void);
* or boot with "acpi_osi=Linux" * or boot with "acpi_osi=Linux"
*/ */
static struct osi_linux { static struct acpi_osi_config {
unsigned int enable:1; unsigned int linux_enable:1;
unsigned int dmi:1; unsigned int linux_dmi:1;
unsigned int cmdline:1; unsigned int linux_cmdline:1;
u8 default_disabling; u8 default_disabling;
} osi_linux = {0, 0, 0, 0}; } osi_config = {0, 0, 0, 0};
static u32 acpi_osi_handler(acpi_string interface, u32 supported) static u32 acpi_osi_handler(acpi_string interface, u32 supported)
{ {
@ -144,9 +144,9 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported)
printk_once(KERN_NOTICE FW_BUG PREFIX printk_once(KERN_NOTICE FW_BUG PREFIX
"BIOS _OSI(Linux) query %s%s\n", "BIOS _OSI(Linux) query %s%s\n",
osi_linux.enable ? "honored" : "ignored", osi_config.linux_enable ? "honored" : "ignored",
osi_linux.cmdline ? " via cmdline" : osi_config.linux_cmdline ? " via cmdline" :
osi_linux.dmi ? " via DMI" : ""); osi_config.linux_dmi ? " via DMI" : "");
} }
if (!strcmp("Darwin", interface)) { if (!strcmp("Darwin", interface)) {
@ -1752,12 +1752,12 @@ void __init acpi_osi_setup(char *str)
str++; str++;
if (*str == '\0') { if (*str == '\0') {
/* Do not override acpi_osi=!* */ /* Do not override acpi_osi=!* */
if (!osi_linux.default_disabling) if (!osi_config.default_disabling)
osi_linux.default_disabling = osi_config.default_disabling =
ACPI_DISABLE_ALL_VENDOR_STRINGS; ACPI_DISABLE_ALL_VENDOR_STRINGS;
return; return;
} else if (*str == '*') { } else if (*str == '*') {
osi_linux.default_disabling = ACPI_DISABLE_ALL_STRINGS; osi_config.default_disabling = ACPI_DISABLE_ALL_STRINGS;
for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) { for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
osi = &osi_setup_entries[i]; osi = &osi_setup_entries[i];
osi->enable = false; osi->enable = false;
@ -1782,10 +1782,10 @@ void __init acpi_osi_setup(char *str)
static void __init set_osi_linux(unsigned int enable) static void __init set_osi_linux(unsigned int enable)
{ {
if (osi_linux.enable != enable) if (osi_config.linux_enable != enable)
osi_linux.enable = enable; osi_config.linux_enable = enable;
if (osi_linux.enable) if (osi_config.linux_enable)
acpi_osi_setup("Linux"); acpi_osi_setup("Linux");
else else
acpi_osi_setup("!Linux"); acpi_osi_setup("!Linux");
@ -1795,8 +1795,9 @@ static void __init set_osi_linux(unsigned int enable)
static void __init acpi_cmdline_osi_linux(unsigned int enable) static void __init acpi_cmdline_osi_linux(unsigned int enable)
{ {
osi_linux.cmdline = 1; /* cmdline set the default and override DMI */ /* cmdline set the default and override DMI */
osi_linux.dmi = 0; osi_config.linux_cmdline = 1;
osi_config.linux_dmi = 0;
set_osi_linux(enable); set_osi_linux(enable);
return; return;
@ -1809,7 +1810,8 @@ void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
if (enable == -1) if (enable == -1)
return; return;
osi_linux.dmi = 1; /* DMI knows that this box asks OSI(Linux) */ /* DMI knows that this box asks OSI(Linux) */
osi_config.linux_dmi = 1;
set_osi_linux(enable); set_osi_linux(enable);
return; return;
@ -1829,12 +1831,12 @@ static void __init acpi_osi_setup_late(void)
int i; int i;
acpi_status status; acpi_status status;
if (osi_linux.default_disabling) { if (osi_config.default_disabling) {
status = acpi_update_interfaces(osi_linux.default_disabling); status = acpi_update_interfaces(osi_config.default_disabling);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors%s\n", printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors%s\n",
osi_linux.default_disabling == osi_config.default_disabling ==
ACPI_DISABLE_ALL_STRINGS ? ACPI_DISABLE_ALL_STRINGS ?
" and feature groups" : ""); " and feature groups" : "");
} }