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

Commit afdca01c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20130725.
  ACPICA: Update names for walk_namespace callbacks to clarify usage.
  ACPICA: Return error if DerefOf resolves to a null package element.
  ACPICA: Make ACPI Power Management Timer (PM Timer) optional.
  ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.
  ACPICA: Fix possible fault for methods that optionally have no return value.
  ACPICA: DeRefOf operator: Update to fully resolve FieldUnit and BufferField refs.
  ACPICA: Emit all unresolved method externals in a text block
  ACPICA: Export acpi_tb_validate_rsdp().
  ACPI: Add facility to remove all _OSI strings
  ACPI: Add facility to disable all _OSI OS vendor strings
  ACPICA: Add acpi_update_interfaces() public interface
  ACPICA: Update version to 20130626
  ACPICA: Fix compiler warnings for casting issues (only some compilers)
  ACPICA: Remove restriction of 256 maximum GPEs in any GPE block
  ACPICA: Disassembler: Expand maximum output string length to 64K
  ACPICA: TableManager: Export acpi_tb_scan_memory_for_rsdp()
  ACPICA: Update comments about behavior when _STA does not exist
parents 4b319f29 36b99b22

Documentation/kernel-parameters.txt

+53 −2
Original line number Diff line number Diff line
@@ -235,10 +235,61 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Format: To spoof as Windows 98: ="Microsoft Windows"



	acpi_osi=	[HW,ACPI] Modify list of supported OS interface strings

			acpi_osi="string1"	# add string1 -- only one string

			acpi_osi="!string2"	# remove built-in string2

			acpi_osi="string1"	# add string1

			acpi_osi="!string2"	# remove string2

			acpi_osi=!*		# remove all strings

			acpi_osi=!		# disable all built-in OS vendor

						  strings

			acpi_osi=		# disable all strings



			'acpi_osi=!' can be used in combination with single or

			multiple 'acpi_osi="string1"' to support specific OS

			vendor string(s).  Note that such command can only

			affect the default state of the OS vendor strings, thus

			it cannot affect the default state of the feature group

			strings and the current state of the OS vendor strings,

			specifying it multiple times through kernel command line

			is meaningless.  This command is useful when one do not

			care about the state of the feature group strings which

			should be controlled by the OSPM.

			Examples:

			  1. 'acpi_osi=! acpi_osi="Windows 2000"' is equivalent

			     to 'acpi_osi="Windows 2000" acpi_osi=!', they all

			     can make '_OSI("Windows 2000")' TRUE.



			'acpi_osi=' cannot be used in combination with other

			'acpi_osi=' command lines, the _OSI method will not

			exist in the ACPI namespace.  NOTE that such command can

			only affect the _OSI support state, thus specifying it

			multiple times through kernel command line is also

			meaningless.

			Examples:

			  1. 'acpi_osi=' can make 'CondRefOf(_OSI, Local1)'

			     FALSE.



			'acpi_osi=!*' can be used in combination with single or

			multiple 'acpi_osi="string1"' to support specific

			string(s).  Note that such command can affect the

			current state of both the OS vendor strings and the

			feature group strings, thus specifying it multiple times

			through kernel command line is meaningful.  But it may

			still not able to affect the final state of a string if

			there are quirks related to this string.  This command

			is useful when one want to control the state of the

			feature group strings to debug BIOS issues related to

			the OSPM features.

			Examples:

			  1. 'acpi_osi="Module Device" acpi_osi=!*' can make

			     '_OSI("Module Device")' FALSE.

			  2. 'acpi_osi=!* acpi_osi="Module Device"' can make

			     '_OSI("Module Device")' TRUE.

			  3. 'acpi_osi=! acpi_osi=!* acpi_osi="Windows 2000"' is

			     equivalent to

			     'acpi_osi=!* acpi_osi=! acpi_osi="Windows 2000"'

			     and

			     'acpi_osi=!* acpi_osi="Windows 2000" acpi_osi=!',

			     they all will make '_OSI("Windows 2000")' TRUE.



	acpi_pm_good	[X86]

			Override the pmtimer bug detection: force the kernel

			to assume that this machine's pmtimer latches its value

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/aclocal.h

+4 −0
Original line number Diff line number Diff line
@@ -942,6 +942,9 @@ struct acpi_interface_info { 


#define ACPI_OSI_INVALID                0x01

#define ACPI_OSI_DYNAMIC                0x02

#define ACPI_OSI_FEATURE                0x04

#define ACPI_OSI_DEFAULT_INVALID        0x08

#define ACPI_OSI_OPTIONAL_FEATURE       (ACPI_OSI_FEATURE | ACPI_OSI_DEFAULT_INVALID | ACPI_OSI_INVALID)



struct acpi_port_info {

	char *name;
@@ -1030,6 +1033,7 @@ struct acpi_external_list { 
	u8 type;

	u8 flags;

	u8 resolved;

	u8 emitted;

};



/* Values for Flags field above */

drivers/acpi/acpica/acnamesp.h

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ acpi_ns_walk_namespace(acpi_object_type type, 
		       acpi_handle start_object,

		       u32 max_depth,

		       u32 flags,

		       acpi_walk_callback pre_order_visit,

		       acpi_walk_callback post_order_visit,

		       acpi_walk_callback descending_callback,

		       acpi_walk_callback ascending_callback,

		       void *context, void **return_value);



struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node

drivers/acpi/acpica/actables.h

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ 


acpi_status acpi_allocate_root_table(u32 initial_table_count);



/*

 * tbxfroot - Root pointer utilities

 */

acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);



u8 *acpi_tb_scan_memory_for_rsdp(u8 *start_address, u32 length);



/*

 * tbfadt - FADT parse/convert/validate

 */