d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi/ec: Fix regression caused by r340644

Browse Source 
After r340644 there were two things wrong in cases where there is both
an ECDT, and an EC device exposed via acpica. The first is a rather
trivial situation where the device desc would say ECDT even when it was
not implicitly created via ECDT (not really sure why the compiler
doesn't seem to warn about this).

The other more pervasive issue is that the code is designed to
essentially not do anything for EC probe when its uid was already
created an EC based on the ECDT's uid. The issue was that probe would
still return 0 in this case, and so we'd end up with some weird
duplication. Now to be honest, I'm not actually sure what exactly broke,
but it was definitely not working as intended. To fix this, all that is
really needed is to make sure we return ENXIO when we're probing the
device already added for the ECDT entry. While here though, move the
check for this earlier to avoid wasted cycles when we know after
obtaining the uid that it's duplicative.

There remains one questionable bit here which I don't want to touch -
when doing probe for PNP0C09, if acquiring _UID for the device fails, 0
is assumed, which is a valid UID used by the implicit ECDT.

Reported by:	Charlie Li, et al.
Reviewed by:	jhb
Differential Revision:	https://reviews.freebsd.org/D18311
This commit is contained in:
bwidawsk 2018-11-26 19:41:13 +00:00
parent 8e370b212f
commit 17083afa3e
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/acpica/acpi_ec.c
View File

@ -362,7 +362,8 @@ acpi_ec_probe(device_t dev)
ret = 0;
goto out;
}
} else
ecdt = 0;
ret = ACPI_ID_PROBE(device_get_parent(dev), dev, ec_ids, NULL);
if (ret > 0)
@ -382,6 +383,22 @@ acpi_ec_probe(device_t dev)
if (ACPI_FAILURE(status))
params->uid = 0;
/*
* Check for a duplicate probe. This can happen when a probe via ECDT
* succeeded already. If this is a duplicate, disable this device.
*
* NB: It would seem device_disable would be sufficient to not get
* duplicated devices, and ENXIO isn't needed, however, device_probe() only
* checks DF_ENABLED at the start and so disabling it here is too late to
* prevent device_attach() from being called.
*/
peer = devclass_get_device(acpi_ec_devclass, params->uid);
if (peer != NULL && device_is_alive(peer)) {
device_disable(dev);
ret = ENXIO;
goto out;
}
status = acpi_GetInteger(h, "_GLK", &params->glk);
if (ACPI_FAILURE(status))
params->glk = 0;
@ -422,16 +439,6 @@ acpi_ec_probe(device_t dev)
/* Store the values we got from the namespace for attach. */
acpi_set_private(dev, params);
/*
* Check for a duplicate probe. This can happen when a probe via ECDT
* succeeded already. If this is a duplicate, disable this device.
*/
peer = devclass_get_device(acpi_ec_devclass, params->uid);
if (peer == NULL || !device_is_alive(peer))
ret = 0;
else
device_disable(dev);
if (buf.Pointer)
AcpiOsFree(buf.Pointer);
out: