| Message ID | 20230424-acpi-prop-v1-1-ffa9a300b1cd@marcan.st |
|---|---|
| State | Accepted |
| Commit | 9bde7fb8940f636f4338bf233883ae37844dcdb7 |
| Headers | show |
| Series | ACPI / property: Support strings in Apple _DSM props | expand |
On 25/04/2023 05.20, Lukas Wunner wrote: > On Mon, Apr 24, 2023 at 03:46:57PM +0900, Hector Martin 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@wunner.de> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> >> Signed-off-by: Hector Martin <marcan@marcan.st> > > I was about to review this when I spotted my Reviewed-by tag above. > Turns out this was first submitted 16 months ago. Wow, time flies! > > https://lore.kernel.org/all/20211226182012.GA5527@wunner.de/ Yup, the original series was never merged and I've been pushing the brcmfmac bits piecewise over time instead... and then I completely forgot about this patch, which turns out to (now) be the last missing piece for WiFi to work on Apple T2 Macs :). - Hector
On Mon, Apr 24, 2023 at 8:47 AM Hector Martin <marcan@marcan.st> 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@wunner.de> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Hector Martin <marcan@marcan.st> > --- > 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!
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;