Skip to content

Commit f91280f

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI: x86: Add ACPI_QUIRK_UART1_SKIP for Lenovo Yoga Book yb1-x90f/l
The Lenovo Yoga Book yb1-x90f/l 2-in-1 which ships with Android as Factory OS has (another) bug in its DSDT where the UART resource for the BTH0 ACPI device contains "\\_SB.PCIO.URT1" as path to the UART. Note that is with a letter 'O' instead of the number '0' which is wrong. This causes Linux to instantiate a standard /dev/ttyS? device for the UART instead of a /sys/bus/serial device, which in turn causes bluetooth to not work. Similar DSDT bugs have been encountered before and to work around those the acpi_quirk_skip_serdev_enumeration() helper exists. Previous devices had the broken resource pointing to the first UART, while the BT HCI was on the second UART, which ACPI_QUIRK_UART1_TTY_UART2_SKIP deals with. Add a new ACPI_QUIRK_UART1_SKIP quirk for skipping enumeration of UART1 instead for the Yoga Book case and add this quirk to the existing DMI quirk table entry for the yb1-x90f/l . This leaves the UART1 controller unbound allowing the x86-android-tablets module to manually instantiate a serdev for it fixing bluetooth. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 4fd5556 commit f91280f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

drivers/acpi/x86/utils.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,11 @@ bool force_storage_d3(void)
259259
* drivers/platform/x86/x86-android-tablets.c kernel module.
260260
*/
261261
#define ACPI_QUIRK_SKIP_I2C_CLIENTS BIT(0)
262-
#define ACPI_QUIRK_UART1_TTY_UART2_SKIP BIT(1)
263-
#define ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY BIT(2)
264-
#define ACPI_QUIRK_USE_ACPI_AC_AND_BATTERY BIT(3)
265-
#define ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS BIT(4)
262+
#define ACPI_QUIRK_UART1_SKIP BIT(1)
263+
#define ACPI_QUIRK_UART1_TTY_UART2_SKIP BIT(2)
264+
#define ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY BIT(3)
265+
#define ACPI_QUIRK_USE_ACPI_AC_AND_BATTERY BIT(4)
266+
#define ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS BIT(5)
266267

267268
static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
268269
/*
@@ -319,6 +320,7 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
319320
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"),
320321
},
321322
.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
323+
ACPI_QUIRK_UART1_SKIP |
322324
ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |
323325
ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),
324326
},
@@ -449,6 +451,9 @@ int acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *s
449451
if (dmi_id)
450452
quirks = (unsigned long)dmi_id->driver_data;
451453

454+
if ((quirks & ACPI_QUIRK_UART1_SKIP) && uid == 1)
455+
*skip = true;
456+
452457
if (quirks & ACPI_QUIRK_UART1_TTY_UART2_SKIP) {
453458
if (uid == 1)
454459
return -ENODEV; /* Create tty cdev instead of serdev */

0 commit comments

Comments
 (0)