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

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

Merge branch 'acpica' 

* acpica:
  ACPICA: Enable auto-serialization as a default kernel behavior.
  ACPICA: Ignore sync_level for methods that have been auto-serialized.
  ACPICA: Add additional named objects for the auto-serialize method scan.
  ACPICA: Add auto-serialization support for ill-behaved control methods.
  ACPICA: Remove global option to serialize all control methods.
parents 0ecfe310 08e1d7c0

Documentation/kernel-parameters.txt

+8 −2
Original line number Diff line number Diff line
@@ -229,6 +229,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			use by PCI

			Format: <irq>,<irq>...



	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

			AML control methods that contain the opcodes to create

			named objects will be marked as "Serialized" by the

			auto-serialization feature.

			This feature is enabled by default.

			This option allows to turn off the feature.



	acpi_no_auto_ssdt	[HW,ACPI] Disable automatic loading of SSDT



	acpica_no_return_repair [HW, ACPI]
@@ -306,8 +314,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

			Format: { level | edge | high | low }



	acpi_serialize	[HW,ACPI] force serialization of AML methods



	acpi_skip_timer_override [HW,ACPI]

			Recognize and ignore IRQ0/pin2 Interrupt Override.

			For broken nForce2 BIOS resulting in XT-PIC timer.

drivers/acpi/acpica/acdispat.h

+8 −5
Original line number Diff line number Diff line
@@ -139,20 +139,21 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, 
			   struct acpi_walk_state *walk_state);



/*

 * dsload - Parser/Interpreter interface, pass 1 namespace load callbacks

 * dsload - Parser/Interpreter interface

 */

acpi_status

acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number);



/* dsload - pass 1 namespace load callbacks */



acpi_status

acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,

		       union acpi_parse_object **out_op);



acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state);



/*

 * dsload - Parser/Interpreter interface, pass 2 namespace load callbacks

 */

/* dsload - pass 2 namespace load callbacks */



acpi_status

acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,

		       union acpi_parse_object **out_op);
@@ -200,7 +201,9 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state); 
/*

 * dsmethod - Parser/Interpreter interface - control method parsing

 */

acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node);

acpi_status

acpi_ds_auto_serialize_method(struct acpi_namespace_node *node,

			      union acpi_operand_object *obj_desc);



acpi_status

acpi_ds_call_control_method(struct acpi_thread_state *thread,

drivers/acpi/acpica/acglobal.h

+6 −5
Original line number Diff line number Diff line
@@ -93,12 +93,13 @@ 
ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_interpreter_slack, FALSE);



/*

 * Automatically serialize ALL control methods? Default is FALSE, meaning

 * to use the Serialized/not_serialized method flags on a per method basis.

 * Only change this if the ASL code is poorly written and cannot handle

 * reentrancy even though methods are marked "NotSerialized".

 * Automatically serialize all methods that create named objects? Default

 * is TRUE, meaning that all non_serialized methods are scanned once at

 * table load time to determine those that create named objects. Methods

 * that create named objects are marked Serialized in order to prevent

 * possible run-time problems if they are entered by more than one thread.

 */

ACPI_INIT_GLOBAL(u8, acpi_gbl_all_methods_serialized, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_auto_serialize_methods, TRUE);



/*

 * Create the predefined _OSI method in the namespace? Default is TRUE

drivers/acpi/acpica/acinterp.h

+0 −4
Original line number Diff line number Diff line
@@ -458,10 +458,6 @@ void acpi_ex_enter_interpreter(void); 


void acpi_ex_exit_interpreter(void);



void acpi_ex_reacquire_interpreter(void);



void acpi_ex_relinquish_interpreter(void);



u8 acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc);



void acpi_ex_acquire_global_lock(u32 rule);

drivers/acpi/acpica/acobject.h

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ struct acpi_object_method { 
#define ACPI_METHOD_INTERNAL_ONLY       0x02	/* Method is implemented internally (_OSI) */

#define ACPI_METHOD_SERIALIZED          0x04	/* Method is serialized */

#define ACPI_METHOD_SERIALIZED_PENDING  0x08	/* Method is to be marked serialized */

#define ACPI_METHOD_MODIFIED_NAMESPACE  0x10	/* Method modified the namespace */

#define ACPI_METHOD_IGNORE_SYNC_LEVEL   0x10	/* Method was auto-serialized at table load time */

#define ACPI_METHOD_MODIFIED_NAMESPACE  0x20	/* Method modified the namespace */



/******************************************************************************

 *