From: Greg Kroah-Hartman Date: Fri, 19 Nov 2021 17:04:32 +0000 (+0100) Subject: 5.14-stable patches X-Git-Tag: v5.4.161~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a172997d82a7fa819a4b5f09b3caffffacc0cdf;p=thirdparty%2Fkernel%2Fstable-queue.git 5.14-stable patches added patches: revert-acpi-scan-release-pm-resources-blocked-by-unused-objects.patch --- diff --git a/queue-5.14/revert-acpi-scan-release-pm-resources-blocked-by-unused-objects.patch b/queue-5.14/revert-acpi-scan-release-pm-resources-blocked-by-unused-objects.patch new file mode 100644 index 00000000000..6506b486377 --- /dev/null +++ b/queue-5.14/revert-acpi-scan-release-pm-resources-blocked-by-unused-objects.patch @@ -0,0 +1,79 @@ +From 3b2b49e6dfdcf423506a771bf44cee842596351a Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Wed, 17 Nov 2021 17:05:41 +0100 +Subject: Revert "ACPI: scan: Release PM resources blocked by unused objects" + +From: Rafael J. Wysocki + +commit 3b2b49e6dfdcf423506a771bf44cee842596351a upstream. + +Revert commit c10383e8ddf4 ("ACPI: scan: Release PM resources blocked +by unused objects"), because it causes boot issues to appear on some +platforms. + +Reported-by: Kyle D. Pelton +Reported-by: Saranya Gopal +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/glue.c | 25 ------------------------- + drivers/acpi/internal.h | 1 - + drivers/acpi/scan.c | 6 ------ + 3 files changed, 32 deletions(-) + +--- a/drivers/acpi/glue.c ++++ b/drivers/acpi/glue.c +@@ -363,28 +363,3 @@ int acpi_platform_notify(struct device * + } + return 0; + } +- +-int acpi_dev_turn_off_if_unused(struct device *dev, void *not_used) +-{ +- struct acpi_device *adev = to_acpi_device(dev); +- +- /* +- * Skip device objects with device IDs, because they may be in use even +- * if they are not companions of any physical device objects. +- */ +- if (adev->pnp.type.hardware_id) +- return 0; +- +- mutex_lock(&adev->physical_node_lock); +- +- /* +- * Device objects without device IDs are not in use if they have no +- * corresponding physical device objects. +- */ +- if (list_empty(&adev->physical_node_list)) +- acpi_device_set_power(adev, ACPI_STATE_D3_COLD); +- +- mutex_unlock(&adev->physical_node_lock); +- +- return 0; +-} +--- a/drivers/acpi/internal.h ++++ b/drivers/acpi/internal.h +@@ -117,7 +117,6 @@ bool acpi_device_is_battery(struct acpi_ + bool acpi_device_is_first_physical_node(struct acpi_device *adev, + const struct device *dev); + int acpi_bus_register_early_device(int type); +-int acpi_dev_turn_off_if_unused(struct device *dev, void *not_used); + + /* -------------------------------------------------------------------------- + Device Matching and Notification +--- a/drivers/acpi/scan.c ++++ b/drivers/acpi/scan.c +@@ -2560,12 +2560,6 @@ int __init acpi_scan_init(void) + } + } + +- /* +- * Make sure that power management resources are not blocked by ACPI +- * device objects with no users. +- */ +- bus_for_each_dev(&acpi_bus_type, NULL, NULL, acpi_dev_turn_off_if_unused); +- + acpi_turn_off_unused_power_resources(); + + acpi_scan_initialized = true; diff --git a/queue-5.14/series b/queue-5.14/series index cd8f2cbee23..32b0db53ef8 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -12,3 +12,4 @@ pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch perf-core-avoid-put_page-when-gup-fails.patch thermal-fix-null-pointer-dereferences-in-of_thermal_-functions.patch +revert-acpi-scan-release-pm-resources-blocked-by-unused-objects.patch