i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs
Commit21653a4181
("i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices()")'s intention was to only move the acpi_install_address_space_handler() call to the point before where the ACPI declared i2c-children of the adapter where instantiated by i2c_acpi_register_devices(). But i2c_acpi_install_space_handler() had a call to acpi_walk_dep_device_list() hidden (that is I missed it) at the end of it, so as an unwanted side-effect now acpi_walk_dep_device_list() was also being called before i2c_acpi_register_devices(). Move the acpi_walk_dep_device_list() call to the end of i2c_acpi_register_devices(), so that it is once again called *after* the i2c_client-s hanging of the adapter have been created. This fixes the Microsoft Surface Go 2 hanging at boot. Fixes:21653a4181
("i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices()") Link: https://bugzilla.kernel.org/show_bug.cgi?id=209627 Reported-by: Rainer Finke <rainer@finke.cc> Reported-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Suggested-by: Maximilian Luz <luzmaximilian@gmail.com> Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Родитель
d769139081
Коммит
8058d69905
|
@ -264,6 +264,7 @@ static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
|
||||||
void i2c_acpi_register_devices(struct i2c_adapter *adap)
|
void i2c_acpi_register_devices(struct i2c_adapter *adap)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
|
acpi_handle handle;
|
||||||
|
|
||||||
if (!has_acpi_companion(&adap->dev))
|
if (!has_acpi_companion(&adap->dev))
|
||||||
return;
|
return;
|
||||||
|
@ -274,6 +275,15 @@ void i2c_acpi_register_devices(struct i2c_adapter *adap)
|
||||||
adap, NULL);
|
adap, NULL);
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
dev_warn(&adap->dev, "failed to enumerate I2C slaves\n");
|
dev_warn(&adap->dev, "failed to enumerate I2C slaves\n");
|
||||||
|
|
||||||
|
if (!adap->dev.parent)
|
||||||
|
return;
|
||||||
|
|
||||||
|
handle = ACPI_HANDLE(adap->dev.parent);
|
||||||
|
if (!handle)
|
||||||
|
return;
|
||||||
|
|
||||||
|
acpi_walk_dep_device_list(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct acpi_device_id i2c_acpi_force_400khz_device_ids[] = {
|
static const struct acpi_device_id i2c_acpi_force_400khz_device_ids[] = {
|
||||||
|
@ -719,7 +729,6 @@ int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
acpi_walk_dep_device_list(handle);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче