lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 533/717] Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"
    Date
    From: Daniel Scally <djrscally@gmail.com>

    commit 12fc4dad94dfac25599f31257aac181c691ca96f upstream.

    This reverts commit 8a66790b7850a6669129af078768a1d42076a0ef.

    Switching this function to AE_CTRL_TERMINATE broke the documented
    behaviour of acpi_dev_get_resources() - AE_CTRL_TERMINATE does not, in
    fact, terminate the resource walk because acpi_walk_resource_buffer()
    ignores it (specifically converting it to AE_OK), referring to that
    value as "an OK termination by the user function". This means that
    acpi_dev_get_resources() does not abort processing when the preproc
    function returns a negative value.

    Signed-off-by: Daniel Scally <djrscally@gmail.com>
    Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/resource.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/acpi/resource.c
    +++ b/drivers/acpi/resource.c
    @@ -541,7 +541,7 @@ static acpi_status acpi_dev_process_reso
    ret = c->preproc(ares, c->preproc_data);
    if (ret < 0) {
    c->error = ret;
    - return AE_CTRL_TERMINATE;
    + return AE_ABORT_METHOD;
    } else if (ret > 0) {
    return AE_OK;
    }

    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:2.060 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site