Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6a56ae7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  properly __init-annotate pm_sysrq_init()
  PM / wakeup: Use irqsave/irqrestore for events_lock
  PM / Freezer: Fix small typo "regrigerator"
  PM / Sleep: Print name of wakeup source that aborts suspend
parents 079d364b bbdc18a3

drivers/base/power/wakeup.c

+40 −6
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ EXPORT_SYMBOL_GPL(wakeup_source_destroy); 
 */

void wakeup_source_add(struct wakeup_source *ws)

{

	unsigned long flags;



	if (WARN_ON(!ws))

		return;
@@ -135,9 +137,9 @@ void wakeup_source_add(struct wakeup_source *ws) 
	ws->active = false;

	ws->last_time = ktime_get();



	spin_lock_irq(&events_lock);

	spin_lock_irqsave(&events_lock, flags);

	list_add_rcu(&ws->entry, &wakeup_sources);

	spin_unlock_irq(&events_lock);

	spin_unlock_irqrestore(&events_lock, flags);

}

EXPORT_SYMBOL_GPL(wakeup_source_add);
@@ -147,12 +149,14 @@ EXPORT_SYMBOL_GPL(wakeup_source_add); 
 */

void wakeup_source_remove(struct wakeup_source *ws)

{

	unsigned long flags;



	if (WARN_ON(!ws))

		return;



	spin_lock_irq(&events_lock);

	spin_lock_irqsave(&events_lock, flags);

	list_del_rcu(&ws->entry);

	spin_unlock_irq(&events_lock);

	spin_unlock_irqrestore(&events_lock, flags);

	synchronize_rcu();

}

EXPORT_SYMBOL_GPL(wakeup_source_remove);
@@ -649,6 +653,31 @@ void pm_wakeup_event(struct device *dev, unsigned int msec) 
}

EXPORT_SYMBOL_GPL(pm_wakeup_event);



static void print_active_wakeup_sources(void)

{

	struct wakeup_source *ws;

	int active = 0;

	struct wakeup_source *last_activity_ws = NULL;



	rcu_read_lock();

	list_for_each_entry_rcu(ws, &wakeup_sources, entry) {

		if (ws->active) {

			pr_info("active wakeup source: %s\n", ws->name);

			active = 1;

		} else if (!active &&

			   (!last_activity_ws ||

			    ktime_to_ns(ws->last_time) >

			    ktime_to_ns(last_activity_ws->last_time))) {

			last_activity_ws = ws;

		}

	}



	if (!active && last_activity_ws)

		pr_info("last active wakeup source: %s\n",

			last_activity_ws->name);

	rcu_read_unlock();

}



/**

 * pm_wakeup_pending - Check if power transition in progress should be aborted.

 *
@@ -671,6 +700,10 @@ bool pm_wakeup_pending(void) 
		events_check_enabled = !ret;

	}

	spin_unlock_irqrestore(&events_lock, flags);



	if (ret)

		print_active_wakeup_sources();



	return ret;

}
@@ -723,15 +756,16 @@ bool pm_get_wakeup_count(unsigned int *count, bool block) 
bool pm_save_wakeup_count(unsigned int count)

{

	unsigned int cnt, inpr;

	unsigned long flags;



	events_check_enabled = false;

	spin_lock_irq(&events_lock);

	spin_lock_irqsave(&events_lock, flags);

	split_counters(&cnt, &inpr);

	if (cnt == count && inpr == 0) {

		saved_count = count;

		events_check_enabled = true;

	}

	spin_unlock_irq(&events_lock);

	spin_unlock_irqrestore(&events_lock, flags);

	return events_check_enabled;

}

kernel/power/poweroff.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = { 
	.enable_mask	= SYSRQ_ENABLE_BOOT,

};



static int pm_sysrq_init(void)

static int __init pm_sysrq_init(void)

{

	register_sysrq_key('o', &sysrq_poweroff_op);

	return 0;

kernel/power/process.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int try_to_freeze_tasks(bool user_only) 


		/*

		 * We need to retry, but first give the freezing tasks some

		 * time to enter the regrigerator.

		 * time to enter the refrigerator.

		 */

		msleep(10);

	}