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

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20190703
  ACPICA: Update table load object initialization
  ACPICA: Update for object initialization sequence
  ACPICA: remove legacy module-level code due to deprecation
  ACPICA: Namespace: simplify creation of the initial/default namespace
  ACPICA: Clear status of GPEs on first direct enable
parents 8ca572ec 02a93f35

drivers/acpi/acpica/acevents.h

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ acpi_status 
acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked);



acpi_status

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info,

			  u8 clear_on_enable);



acpi_status

acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);

drivers/acpi/acpica/acglobal.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ ACPI_GLOBAL(u8, acpi_gbl_verbose_leak_dump); 
ACPI_GLOBAL(struct acpi_namespace_node, acpi_gbl_root_node_struct);

ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_root_node);

ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_fadt_gpe_device);

ACPI_GLOBAL(union acpi_operand_object *, acpi_gbl_module_code_list);



extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];

extern const struct acpi_predefined_names

drivers/acpi/acpica/acnamesp.h

+0 −2
Original line number Diff line number Diff line
@@ -207,8 +207,6 @@ acpi_ns_dump_object_paths(acpi_object_type type, 
 */

acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info);



void acpi_ns_exec_module_code_list(void);



/*

 * nsarguments - Argument count/type checking for predefined/reserved names

 */

drivers/acpi/acpica/dsinit.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ acpi_ds_initialize_objects(u32 table_index, 


	if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_DSDT)) {

		ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,

				      "\nInitializing Namespace objects:\n"));

				      "\nACPI table initialization:\n"));

	}



	/* Summary of objects initialized */

drivers/acpi/acpica/evgpe.c

+7 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked) 
 * FUNCTION:    acpi_ev_add_gpe_reference

 *

 * PARAMETERS:  gpe_event_info          - Add a reference to this GPE

 *              clear_on_enable         - Clear GPE status before enabling it

 *

 * RETURN:      Status

 *
@@ -155,7 +156,8 @@ acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked) 
 ******************************************************************************/



acpi_status

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info,

			  u8 clear_on_enable)

{

	acpi_status status = AE_OK;
@@ -170,6 +172,10 @@ acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info) 


		/* Enable on first reference */



		if (clear_on_enable) {

			(void)acpi_hw_clear_gpe(gpe_event_info);

		}



		status = acpi_ev_update_gpe_enable_mask(gpe_event_info);

		if (ACPI_SUCCESS(status)) {

			status = acpi_ev_enable_gpe(gpe_event_info);

CRA Git | Maintained and supported by SUSTech CRA and CCSE