]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branches 'pm-pci', 'acpi-pm', 'pm-sleep' and 'pm-avs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 4 Jun 2018 08:41:53 +0000 (10:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 4 Jun 2018 08:41:53 +0000 (10:41 +0200)
* pm-pci:
  PCI / PM: Clean up outdated comments in pci_target_state()
  PCI / PM: Do not clear state_saved for devices that remain suspended

* acpi-pm:
  ACPI: EC: Dispatch the EC GPE directly on s2idle wake
  ACPICA: Introduce acpi_dispatch_gpe()

* pm-sleep:
  PM / hibernate: Fix oops at snapshot_write()
  PM / wakeup: Make s2idle_lock a RAW_SPINLOCK
  PM / s2idle: Make s2idle_wait_head swait based
  PM / wakeup: Make events_lock a RAW_SPINLOCK
  PM / suspend: Prevent might sleep splats

* pm-avs:
  PM / AVS: rockchip-io: add io selectors and supplies for PX30

1  2  3  4  5 
drivers/base/power/wakeup.c

index e1322788eaee72fd7629f8bf0c4a996c7f9a1edd,ea01621ed769ab262b39d421d24f83a8433130ab,ea01621ed769ab262b39d421d24f83a8433130ab,2e76fbcba76e37e30ac9cda141f430acdccb5162,ea01621ed769ab262b39d421d24f83a8433130ab..5fa1898755a3487862ea76d2a9e39dc03830ef7d
@@@@@@ -183,10 -183,11 -183,11 -183,11 -183,11 +183,10 @@@@@@ void wakeup_source_add(struct wakeup_so
        spin_lock_init(&ws->lock);
        timer_setup(&ws->timer, pm_wakeup_timer_fn, 0);
        ws->active = false;
 ----   ws->last_time = ktime_get();
     
--- -   spin_lock_irqsave(&events_lock, flags);
+++ +   raw_spin_lock_irqsave(&events_lock, flags);
        list_add_rcu(&ws->entry, &wakeup_sources);
--- -   spin_unlock_irqrestore(&events_lock, flags);
+++ +   raw_spin_unlock_irqrestore(&events_lock, flags);
     }
     EXPORT_SYMBOL_GPL(wakeup_source_add);
     
@@@@@@ -850,10 -851,10 -851,10 -851,10 -851,10 +850,10 @@@@@@ bool pm_wakeup_pending(void
                ret = (cnt != saved_count || inpr > 0);
                events_check_enabled = !ret;
        }
--- -   spin_unlock_irqrestore(&events_lock, flags);
+++ +   raw_spin_unlock_irqrestore(&events_lock, flags);
     
        if (ret) {
 ----           pr_info("PM: Wakeup pending, aborting suspend\n");
 ++++           pr_debug("PM: Wakeup pending, aborting suspend\n");
                pm_print_active_wakeup_sources();
        }