You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Redecorating
e9cd73ca95
This means firmware will be selected automatically like macOS does. These patches also fix a couple of bugs and make a few optimisations. For this firmware selection: # in macos (or linux if you have a copy of the wifi folder): git clone https://github.com/AsahiLinux/asahi-installer --depth=1 cd asahi-installer/src python3 -m firmware.wifi /usr/share/firmware/wifi firmware.tar # in linux cd /lib/firmware sudo tar xf /path/to/firmware.tar
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From d7efc0ae360df39dea3a843fb7bd57127652f728 Mon Sep 17 00:00:00 2001
|
|
From: Hector Martin <marcan@marcan.st>
|
|
Date: Thu, 23 Dec 2021 19:51:11 +0900
|
|
Subject: [PATCH 14/30] ACPI / property: Support strings in Apple _DSM props
|
|
|
|
The Wi-Fi module in 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().
|
|
|
|
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 c285c91a5..1f5a0694c 100644
|
|
--- a/drivers/acpi/x86/apple.c
|
|
+++ b/drivers/acpi/x86/apple.c
|
|
@@ -70,13 +70,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);
|
|
@@ -118,6 +121,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;
|
|
--
|
|
2.34.1
|
|
|