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

Commit 63347db0 authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs 



The acpi_get_bus_status wrapper for acpi_bus_get_status_handle has some
code to handle certain device quirks, in some cases we also need this
quirk handling for the initial _STA call.

Specifically on some devices calling _STA before all _DEP dependencies
are met results in errors like these:

[    0.123579] ACPI Error: No handler for Region [ECRM] (00000000ba9edc4c)
               [GenericSerialBus] (20170831/evregion-166)
[    0.123601] ACPI Error: Region GenericSerialBus (ID=9) has no handler
               (20170831/exfldio-299)
[    0.123618] ACPI Error: Method parse/execution failed
               \_SB.I2C1.BAT1._STA, AE_NOT_EXIST (20170831/psparse-550)

acpi_get_bus_status already has code to avoid this, so by using it we
also silence these errors from the initial _STA call.

Note that in order for the acpi_get_bus_status handling for this to work,
we initialize dep_unmet to 1 until acpi_device_dep_initialize gets called,
this means that battery devices will be instantiated with an initial
status of 0. This is not a problem, acpi_bus_attach will get called soon
after the instantiation anyways and it will update the status as first
point of order.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 54ddce70

drivers/acpi/scan.c

+17 −3
Original line number Diff line number Diff line
@@ -1565,6 +1565,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, 
	device_initialize(&device->dev);

	dev_set_uevent_suppress(&device->dev, true);

	acpi_init_coherency(device);

	/* Assume there are unmet deps until acpi_device_dep_initialize() runs */

	device->dep_unmet = 1;

}



void acpi_device_add_finalize(struct acpi_device *device)
@@ -1588,6 +1590,14 @@ static int acpi_add_single_object(struct acpi_device **child, 
	}



	acpi_init_device_object(device, handle, type, sta);

	/*

	 * For ACPI_BUS_TYPE_DEVICE getting the status is delayed till here so

	 * that we can call acpi_bus_get_status() and use its quirk handling.

	 * Note this must be done before the get power-/wakeup_dev-flags calls.

	 */

	if (type == ACPI_BUS_TYPE_DEVICE)

		acpi_bus_get_status(device);



	acpi_bus_get_power_flags(device);

	acpi_bus_get_wakeup_device_flags(device);
@@ -1660,8 +1670,10 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type, 
			return -ENODEV;



		*type = ACPI_BUS_TYPE_DEVICE;

		status = acpi_bus_get_status_handle(handle, sta);

		if (ACPI_FAILURE(status))

		/*

		 * acpi_add_single_object updates this once we've an acpi_device

		 * so that acpi_bus_get_status' quirk handling can be used.

		 */

		*sta = 0;

		break;

	case ACPI_TYPE_PROCESSOR:
@@ -1760,6 +1772,8 @@ static void acpi_device_dep_initialize(struct acpi_device *adev) 
	acpi_status status;

	int i;



	adev->dep_unmet = 0;



	if (!acpi_has_method(adev->handle, "_DEP"))

		return;