lkml.org 
[lkml]   [2017]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 077/105] ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>


    [ Upstream commit c2a6bbaf0c5f90463a7011a295bbdb7e33c80b51 ]

    The way acpi_find_child_device() works currently is that, if there
    are two (or more) devices with the same _ADR value in the same
    namespace scope (which is not specifically allowed by the spec and
    the OS behavior in that case is not defined), the first one of them
    found to be present (with the help of _STA) will be returned.

    This covers the majority of cases, but is not sufficient if some of
    the devices in question have a _HID (or _CID) returning some valid
    ACPI/PNP device IDs (which is disallowed by the spec) and the
    ASL writers' expectation appears to be that the OS will match
    devices without a valid ACPI/PNP device ID against a given bus
    address first.

    To cover this special case as well, modify find_child_checks()
    to prefer devices without ACPI/PNP device IDs over devices that
    have them.

    Suggested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Tested-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/acpi/glue.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/drivers/acpi/glue.c
    +++ b/drivers/acpi/glue.c
    @@ -98,7 +98,15 @@ static int find_child_checks(struct acpi
    if (check_children && list_empty(&adev->children))
    return -ENODEV;

    - return sta_present ? FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
    + /*
    + * If the device has a _HID (or _CID) returning a valid ACPI/PNP
    + * device ID, it is better to make it look less attractive here, so that
    + * the other device with the same _ADR value (that may not have a valid
    + * device ID) can be matched going forward. [This means a second spec
    + * violation in a row, so whatever we do here is best effort anyway.]
    + */
    + return sta_present && list_empty(&adev->pnp.ids) ?
    + FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
    }

    struct acpi_device *acpi_find_child_device(struct acpi_device *parent,

    \
     
     \ /
      Last update: 2017-08-05 01:19    [W:4.107 / U:0.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site