Merge tag 'pm-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These include a fix for a recent regression in the ACPI CPU
performance scaling code, a PCI device power management fix,
a system shutdown fix related to cpufreq, a removal of an ACPI
suspend-to-idle blacklist entry and a build warning fix.

Specifics:

   - Fix possible NULL pointer dereference in the ACPI processor scaling
     initialization code introduced by a recent cpufreq update (Rafael
     Wysocki).

   - Fix possible deadlock due to suspending cpufreq too late during
     system shutdown (Rafael Wysocki).

   - Make the PCI device system resume code path be more consistent with
     its PM-runtime counterpart to fix an issue with missing delay on
     transitions from D3cold to D0 during system resume from
     suspend-to-idle on some systems (Rafael Wysocki).

   - Drop Dell XPS13 9360 from the LPS0 Idle _DSM blacklist to make it
     use suspend-to-idle by default (Mario Limonciello).

   - Fix build warning in the core system suspend support code (Ben
     Dooks)"

* tag 'pm-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: processor: Avoid NULL pointer dereferences at init time
  PCI: PM: Fix pci_power_up()
  PM: sleep: include <linux/pm_runtime.h> for pm_wq
  cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown
  ACPI: PM: Drop Dell XPS13 9360 from LPS0 Idle _DSM blacklist

3 files changed, 12 insertions, 21 deletions

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 2261713d1aec..930a49fa4dfc 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -162,21 +162,23 @@ void acpi_processor_ppc_init(int cpu)
         struct acpi_processor *pr = per_cpu(processors, cpu);
         int ret;
 
+        if (!pr)
+                return;
+
         ret = dev_pm_qos_add_request(get_cpu_device(cpu),
                                      &pr->perflib_req, DEV_PM_QOS_MAX_FREQUENCY,
                                      INT_MAX);
-        if (ret < 0) {
+        if (ret < 0)
                 pr_err("Failed to add freq constraint for CPU%d (%d)\n", cpu,
                        ret);
-                return;
-        }
 }
 
 void acpi_processor_ppc_exit(int cpu)
 {
         struct acpi_processor *pr = per_cpu(processors, cpu);
 
-        dev_pm_qos_remove_request(&pr->perflib_req);
+        if (pr)
+                dev_pm_qos_remove_request(&pr->perflib_req);
 }
 
 static int acpi_processor_get_performance_control(struct acpi_processor *pr)
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index ec2638f1df4f..8227c7dd75b1 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -130,21 +130,23 @@ void acpi_thermal_cpufreq_init(int cpu)
         struct acpi_processor *pr = per_cpu(processors, cpu);
         int ret;
 
+        if (!pr)
+                return;
+
         ret = dev_pm_qos_add_request(get_cpu_device(cpu),
                                      &pr->thermal_req, DEV_PM_QOS_MAX_FREQUENCY,
                                      INT_MAX);
-        if (ret < 0) {
+        if (ret < 0)
                 pr_err("Failed to add freq constraint for CPU%d (%d)\n", cpu,
                        ret);
-                return;
-        }
 }
 
 void acpi_thermal_cpufreq_exit(int cpu)
 {
         struct acpi_processor *pr = per_cpu(processors, cpu);
 
-        dev_pm_qos_remove_request(&pr->thermal_req);
+        if (pr)
+                dev_pm_qos_remove_request(&pr->thermal_req);
 }
 #else                           /* ! CONFIG_CPU_FREQ */
 static int cpufreq_get_max_state(unsigned int cpu)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 9fa77d72ef27..2af937a8b1c5 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -362,19 +362,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
                 },
         },
         /*
-         * https://bugzilla.kernel.org/show_bug.cgi?id=196907
-         * Some Dell XPS13 9360 cannot do suspend-to-idle using the Low Power
-         * S0 Idle firmware interface.
-         */
-        {
-        .callback = init_default_s3,
-        .ident = "Dell XPS13 9360",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),
-                },
-        },
-        /*
          * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using
          * the Low Power S0 Idle firmware interface (see
          * https://bugzilla.kernel.org/show_bug.cgi?id=199057).