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

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

Merge branches 'acpica-fix', 'acpi-ec-fix' and 'acpi-properties-fix' 

* acpica-fix:
  ACPICA: Fix acpi_evaluate_object_typed()

* acpi-ec-fix:
  ACPI: EC: Fix regression related to wrong ECDT initialization order

* acpi-properties-fix:
  ACPI: device property: Fix node lookup in acpi_graph_get_child_prop_value()
parents 9b40eebc 98529b92 b5212f57

drivers/acpi/ec.c

+7 −10
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ int __init acpi_ec_dsdt_probe(void) 
 * functioning ECDT EC first in order to handle the events.

 * https://bugzilla.kernel.org/show_bug.cgi?id=115021

 */

int __init acpi_ec_ecdt_start(void)

static int __init acpi_ec_ecdt_start(void)

{

	acpi_handle handle;
@@ -2003,20 +2003,17 @@ static inline void acpi_ec_query_exit(void) 
int __init acpi_ec_init(void)

{

	int result;

	int ecdt_fail, dsdt_fail;



	/* register workqueue for _Qxx evaluations */

	result = acpi_ec_query_init();

	if (result)

		goto err_exit;

	/* Now register the driver for the EC */

	result = acpi_bus_register_driver(&acpi_ec_driver);

	if (result)

		goto err_exit;



err_exit:

	if (result)

		acpi_ec_query_exit();

		return result;



	/* Drivers must be started after acpi_ec_query_init() */

	ecdt_fail = acpi_ec_ecdt_start();

	dsdt_fail = acpi_bus_register_driver(&acpi_ec_driver);

	return ecdt_fail && dsdt_fail ? -ENODEV : 0;

}



/* EC driver currently not unloadable */

drivers/acpi/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ typedef int (*acpi_ec_query_func) (void *data); 
int acpi_ec_init(void);

int acpi_ec_ecdt_probe(void);

int acpi_ec_dsdt_probe(void);

int acpi_ec_ecdt_start(void);

void acpi_ec_block_transactions(void);

void acpi_ec_unblock_transactions(void);

int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,

drivers/acpi/property.c

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ static struct fwnode_handle *acpi_graph_get_child_prop_value( 
	fwnode_for_each_child_node(fwnode, child) {

		u32 nr;



		if (!fwnode_property_read_u32(fwnode, prop_name, &nr))

		if (fwnode_property_read_u32(child, prop_name, &nr))

			continue;



		if (val == nr)

drivers/acpi/scan.c

+0 −1
Original line number Diff line number Diff line
@@ -2084,7 +2084,6 @@ int __init acpi_scan_init(void) 


	acpi_gpe_apply_masked_gpes();

	acpi_update_all_gpes();

	acpi_ec_ecdt_start();



	acpi_scan_initialized = true;