2020-12-05 18:46:10

by Daniel Scally

Subject: [PATCH v2] Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"

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 <[email protected]>
---
drivers/acpi/resource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index ad04824ca3ba..f2f5f1dc7c61 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -541,7 +541,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
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;
}
--
2.25.1

2020-12-07 13:07:08

by Rafael J. Wysocki

Subject: Re: [PATCH v2] Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"

On Sat, Dec 5, 2020 at 7:42 PM Daniel Scally <[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> drivers/acpi/resource.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
> index ad04824ca3ba..f2f5f1dc7c61 100644
> --- a/drivers/acpi/resource.c
> +++ b/drivers/acpi/resource.c
> @@ -541,7 +541,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
> 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;
> }
> --

Applied as 5.11 material, thanks!