Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2641f540 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version. 



The original commit 242b2287 "ACPICA:
expose OSI version" triggers build errors in ACPICA when it is back
ported.  The patch removes the divergences between Linux and upstream
ACPICA resulting from that.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bf0dd264

drivers/acpi/acpica/acglobal.h

+6 −1
Original line number Diff line number Diff line
@@ -138,6 +138,12 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_ssdt_table_load, FALSE);



/*

 * We keep track of the latest version of Windows that has been requested by

 * the BIOS.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_osi_data, 0);



/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */



struct acpi_table_fadt acpi_gbl_FADT;
@@ -285,7 +291,6 @@ ACPI_EXTERN u8 acpi_gbl_debugger_configuration; 
ACPI_EXTERN u8 acpi_gbl_step_to_next_call;

ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;

ACPI_EXTERN u8 acpi_gbl_events_initialized;

ACPI_EXTERN u8 acpi_gbl_osi_data;

ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;

ACPI_EXTERN struct acpi_address_range

    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];

drivers/acpi/acpica/utglobal.c

+0 −1
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ acpi_status acpi_ut_init_globals(void) 
	acpi_gbl_trace_dbg_layer = 0;

	acpi_gbl_debugger_configuration = DEBUGGER_THREADING;

	acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;

	acpi_gbl_osi_data = 0;

	acpi_gbl_osi_mutex = NULL;

	acpi_gbl_reg_methods_executed = FALSE;

include/acpi/actypes.h

+13 −15
Original line number Diff line number Diff line
@@ -1137,7 +1137,19 @@ struct acpi_memory_list { 
#endif

};



/* Definitions for _OSI support */

/* Definitions of _OSI support */



#define ACPI_VENDOR_STRINGS                 0x01

#define ACPI_FEATURE_STRINGS                0x02

#define ACPI_ENABLE_INTERFACES              0x00

#define ACPI_DISABLE_INTERFACES             0x04



#define ACPI_DISABLE_ALL_VENDOR_STRINGS     (ACPI_DISABLE_INTERFACES | ACPI_VENDOR_STRINGS)

#define ACPI_DISABLE_ALL_FEATURE_STRINGS    (ACPI_DISABLE_INTERFACES | ACPI_FEATURE_STRINGS)

#define ACPI_DISABLE_ALL_STRINGS            (ACPI_DISABLE_INTERFACES | ACPI_VENDOR_STRINGS | ACPI_FEATURE_STRINGS)

#define ACPI_ENABLE_ALL_VENDOR_STRINGS      (ACPI_ENABLE_INTERFACES | ACPI_VENDOR_STRINGS)

#define ACPI_ENABLE_ALL_FEATURE_STRINGS     (ACPI_ENABLE_INTERFACES | ACPI_FEATURE_STRINGS)

#define ACPI_ENABLE_ALL_STRINGS             (ACPI_ENABLE_INTERFACES | ACPI_VENDOR_STRINGS | ACPI_FEATURE_STRINGS)



#define ACPI_OSI_WIN_2000               0x01

#define ACPI_OSI_WIN_XP                 0x02
@@ -1152,18 +1164,4 @@ struct acpi_memory_list { 
#define ACPI_OSI_WIN_7                  0x0B

#define ACPI_OSI_WIN_8                  0x0C



/* _OSI update actions */



#define ACPI_VENDOR_STRINGS                 0x01

#define ACPI_FEATURE_STRINGS                0x02

#define ACPI_ENABLE_INTERFACES              0x00

#define ACPI_DISABLE_INTERFACES             0x04



#define ACPI_DISABLE_ALL_VENDOR_STRINGS     (ACPI_DISABLE_INTERFACES | ACPI_VENDOR_STRINGS)

#define ACPI_DISABLE_ALL_FEATURE_STRINGS    (ACPI_DISABLE_INTERFACES | ACPI_FEATURE_STRINGS)

#define ACPI_DISABLE_ALL_STRINGS            (ACPI_DISABLE_INTERFACES | ACPI_VENDOR_STRINGS | ACPI_FEATURE_STRINGS)

#define ACPI_ENABLE_ALL_VENDOR_STRINGS      (ACPI_ENABLE_INTERFACES | ACPI_VENDOR_STRINGS)

#define ACPI_ENABLE_ALL_FEATURE_STRINGS     (ACPI_ENABLE_INTERFACES | ACPI_FEATURE_STRINGS)

#define ACPI_ENABLE_ALL_STRINGS             (ACPI_ENABLE_INTERFACES | ACPI_VENDOR_STRINGS | ACPI_FEATURE_STRINGS)



#endif				/* __ACTYPES_H__ */