Re: [PATCH] ACPI / property: Support strings in Apple _DSM props

[Rafael J. Wysocki]

On Mon, Apr 24, 2023 at 8:47 AM Hector Martin <marcan@xxxxxxxxx> wrote:
>
> The Wi-Fi module in x86 Apple machines has a "module-instance" device
> property that specifies the platform type and is used for firmware
> selection. Its value is a string, so add support for string values in
> acpi_extract_apple_properties().
>
> Reviewed-by: Lukas Wunner <lukas@xxxxxxxxx>
> Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Signed-off-by: Hector Martin <marcan@xxxxxxxxx>
> ---
>  drivers/acpi/x86/apple.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/x86/apple.c b/drivers/acpi/x86/apple.c
> index 8812ecd03d55..45d0f16f374f 100644
> --- a/drivers/acpi/x86/apple.c
> +++ b/drivers/acpi/x86/apple.c
> @@ -71,13 +71,16 @@ void acpi_extract_apple_properties(struct acpi_device *adev)
>
>                 if ( key->type != ACPI_TYPE_STRING ||
>                     (val->type != ACPI_TYPE_INTEGER &&
> -                    val->type != ACPI_TYPE_BUFFER))
> +                    val->type != ACPI_TYPE_BUFFER &&
> +                    val->type != ACPI_TYPE_STRING))
>                         continue; /* skip invalid properties */
>
>                 __set_bit(i, valid);
>                 newsize += key->string.length + 1;
>                 if ( val->type == ACPI_TYPE_BUFFER)
>                         newsize += val->buffer.length;
> +               else if (val->type == ACPI_TYPE_STRING)
> +                       newsize += val->string.length + 1;
>         }
>
>         numvalid = bitmap_weight(valid, numprops);
> @@ -119,6 +122,12 @@ void acpi_extract_apple_properties(struct acpi_device *adev)
>                 newprops[v].type = val->type;
>                 if (val->type == ACPI_TYPE_INTEGER) {
>                         newprops[v].integer.value = val->integer.value;
> +               } else if (val->type == ACPI_TYPE_STRING) {
> +                       newprops[v].string.length = val->string.length;
> +                       newprops[v].string.pointer = free_space;
> +                       memcpy(free_space, val->string.pointer,
> +                              val->string.length);
> +                       free_space += val->string.length + 1;
>                 } else {
>                         newprops[v].buffer.length = val->buffer.length;
>                         newprops[v].buffer.pointer = free_space;
>
> ---

Applied as 6.4-rc material, thanks!