Skip to content

Commit 1c2a33d

Browse files
committed
Merge tag 'acpi-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These make an excess warning message go away and fix a recently introduced boot failure on a vintage machine. Specifics: - Change the log level of the "table not found" message in acpi_table_parse_entries_array() to debug to prevent it from showing up in the logs unnecessarily (Dan Williams) - Add a C-state limit quirk for 32-bit ThinkPad T40 to prevent it from crashing on boot after recent changes in the ACPI processor driver (Woody Suwalski)" * tag 'acpi-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40 ACPI: tables: Quiet ACPI table not found warning
2 parents 241c32d + 8292656 commit 1c2a33d

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/acpi/processor_idle.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ static const struct dmi_system_id processor_power_dmi_table[] = {
9696
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
9797
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
9898
(void *)1},
99+
/* T40 can not handle C3 idle state */
100+
{ set_max_cstate, "IBM ThinkPad T40", {
101+
DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
102+
DMI_MATCH(DMI_PRODUCT_NAME, "23737CU")},
103+
(void *)2},
99104
{},
100105
};
101106

drivers/acpi/tables.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ int __init_or_acpilib acpi_table_parse_entries_array(
400400

401401
acpi_get_table(id, instance, &table_header);
402402
if (!table_header) {
403-
pr_warn("%4.4s not present\n", id);
403+
pr_debug("%4.4s not present\n", id);
404404
return -ENODEV;
405405
}
406406

0 commit comments

Comments
 (0)