Skip to content

Commit a984d06

Browse files
committed
Merge branches 'acpi-x86', 'acpi-processor' and 'acpi-resource'
Merge an x86-specific ACPI fix, an ACPI processor driver fix, and a new ACPI resources management quirk for 6.15-rc1: - Extend the Lenovo Yoga Tab 3 ACPI quirk to skip GPIO event-handlers along with ACPI AC and battery which makes it work with Linux when started in the Windows mode (Hans de Goede). - Prevent the ACPI processor idle driver from being used on systems without _CST and with invalid C2/C3 in FADT in order to restore its previous (and expected) behavior that has been altered inadvertently by a recent code change (Giovanni Gherdovich). - Skip ACPI IRQ override on ASUS Vivobook 14 X1404VAP to make the internal keyboard work on it (Paul Menzel). * acpi-x86: ACPI: x86: Extend Lenovo Yoga Tab 3 quirk with skip GPIO event-handlers * acpi-processor: ACPI: processor: idle: Return an error if both P_LVL{2,3} idle states are invalid * acpi-resource: ACPI: resource: Skip IRQ override on ASUS Vivobook 14 X1404VAP
4 parents f06777c + 2fa87c7 + 9e9b893 + 2da31ea commit a984d06

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

drivers/acpi/processor_idle.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,10 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
268268
ACPI_CX_DESC_LEN, "ACPI P_LVL3 IOPORT 0x%x",
269269
pr->power.states[ACPI_STATE_C3].address);
270270

271+
if (!pr->power.states[ACPI_STATE_C2].address &&
272+
!pr->power.states[ACPI_STATE_C3].address)
273+
return -ENODEV;
274+
271275
return 0;
272276
}
273277

drivers/acpi/resource.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
440440
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
441441
},
442442
},
443+
{
444+
/* Asus Vivobook X1404VAP */
445+
.matches = {
446+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
447+
DMI_MATCH(DMI_BOARD_NAME, "X1404VAP"),
448+
},
449+
},
443450
{
444451
/* Asus Vivobook X1504VAP */
445452
.matches = {

drivers/acpi/x86/utils.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
374374
DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
375375
},
376376
.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
377-
ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),
377+
ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |
378+
ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),
378379
},
379380
{
380381
/* Medion Lifetab S10346 */

0 commit comments

Comments
 (0)