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

Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-sleep' 

* pm-core:
  PM-runtime: Switch autosuspend over to using hrtimers

* pm-qos:
  PM / QoS: Change to use DEFINE_SHOW_ATTRIBUTE macro

* pm-domains:
  PM / Domains: remove define_genpd_open_function() and define_genpd_debugfs_fops()

* pm-sleep:
  PM / sleep: convert to DEFINE_SHOW_ATTRIBUTE
parents 6f049e7c 8234f673 96c69352 d32dcc6c 943a10f8

drivers/base/power/domain.c

+24 −47
Original line number Diff line number Diff line
@@ -2749,7 +2749,7 @@ exit: 
	return 0;

}



static int genpd_summary_show(struct seq_file *s, void *data)

static int summary_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd;

	int ret = 0;
@@ -2772,7 +2772,7 @@ static int genpd_summary_show(struct seq_file *s, void *data) 
	return ret;

}



static int genpd_status_show(struct seq_file *s, void *data)

static int status_show(struct seq_file *s, void *data)

{

	static const char * const status_lookup[] = {

		[GPD_STATE_ACTIVE] = "on",
@@ -2799,7 +2799,7 @@ exit: 
	return ret;

}



static int genpd_sub_domains_show(struct seq_file *s, void *data)

static int sub_domains_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;

	struct gpd_link *link;
@@ -2816,7 +2816,7 @@ static int genpd_sub_domains_show(struct seq_file *s, void *data) 
	return ret;

}



static int genpd_idle_states_show(struct seq_file *s, void *data)

static int idle_states_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;

	unsigned int i;
@@ -2845,7 +2845,7 @@ static int genpd_idle_states_show(struct seq_file *s, void *data) 
	return ret;

}



static int genpd_active_time_show(struct seq_file *s, void *data)

static int active_time_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;

	ktime_t delta = 0;
@@ -2865,7 +2865,7 @@ static int genpd_active_time_show(struct seq_file *s, void *data) 
	return ret;

}



static int genpd_total_idle_time_show(struct seq_file *s, void *data)

static int total_idle_time_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;

	ktime_t delta = 0, total = 0;
@@ -2893,7 +2893,7 @@ static int genpd_total_idle_time_show(struct seq_file *s, void *data) 
}





static int genpd_devices_show(struct seq_file *s, void *data)

static int devices_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;

	struct pm_domain_data *pm_data;
@@ -2919,7 +2919,7 @@ static int genpd_devices_show(struct seq_file *s, void *data) 
	return ret;

}



static int genpd_perf_state_show(struct seq_file *s, void *data)

static int perf_state_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *genpd = s->private;
@@ -2932,37 +2932,14 @@ static int genpd_perf_state_show(struct seq_file *s, void *data) 
	return 0;

}



#define define_genpd_open_function(name) \

static int genpd_##name##_open(struct inode *inode, struct file *file) \

{ \

	return single_open(file, genpd_##name##_show, inode->i_private); \

}



define_genpd_open_function(summary);

define_genpd_open_function(status);

define_genpd_open_function(sub_domains);

define_genpd_open_function(idle_states);

define_genpd_open_function(active_time);

define_genpd_open_function(total_idle_time);

define_genpd_open_function(devices);

define_genpd_open_function(perf_state);



#define define_genpd_debugfs_fops(name) \

static const struct file_operations genpd_##name##_fops = { \

	.open = genpd_##name##_open, \

	.read = seq_read, \

	.llseek = seq_lseek, \

	.release = single_release, \

}



define_genpd_debugfs_fops(summary);

define_genpd_debugfs_fops(status);

define_genpd_debugfs_fops(sub_domains);

define_genpd_debugfs_fops(idle_states);

define_genpd_debugfs_fops(active_time);

define_genpd_debugfs_fops(total_idle_time);

define_genpd_debugfs_fops(devices);

define_genpd_debugfs_fops(perf_state);

DEFINE_SHOW_ATTRIBUTE(summary);

DEFINE_SHOW_ATTRIBUTE(status);

DEFINE_SHOW_ATTRIBUTE(sub_domains);

DEFINE_SHOW_ATTRIBUTE(idle_states);

DEFINE_SHOW_ATTRIBUTE(active_time);

DEFINE_SHOW_ATTRIBUTE(total_idle_time);

DEFINE_SHOW_ATTRIBUTE(devices);

DEFINE_SHOW_ATTRIBUTE(perf_state);



static int __init genpd_debug_init(void)

{
@@ -2975,7 +2952,7 @@ static int __init genpd_debug_init(void) 
		return -ENOMEM;



	d = debugfs_create_file("pm_genpd_summary", S_IRUGO,

			genpd_debugfs_dir, NULL, &genpd_summary_fops);

			genpd_debugfs_dir, NULL, &summary_fops);

	if (!d)

		return -ENOMEM;
@@ -2985,20 +2962,20 @@ static int __init genpd_debug_init(void) 
			return -ENOMEM;



		debugfs_create_file("current_state", 0444,

				d, genpd, &genpd_status_fops);

				d, genpd, &status_fops);

		debugfs_create_file("sub_domains", 0444,

				d, genpd, &genpd_sub_domains_fops);

				d, genpd, &sub_domains_fops);

		debugfs_create_file("idle_states", 0444,

				d, genpd, &genpd_idle_states_fops);

				d, genpd, &idle_states_fops);

		debugfs_create_file("active_time", 0444,

				d, genpd, &genpd_active_time_fops);

				d, genpd, &active_time_fops);

		debugfs_create_file("total_idle_time", 0444,

				d, genpd, &genpd_total_idle_time_fops);

				d, genpd, &total_idle_time_fops);

		debugfs_create_file("devices", 0444,

				d, genpd, &genpd_devices_fops);

				d, genpd, &devices_fops);

		if (genpd->set_performance_state)

			debugfs_create_file("perf_state", 0444,

					    d, genpd, &genpd_perf_state_fops);

					    d, genpd, &perf_state_fops);

	}



	return 0;

drivers/base/power/runtime.c

+34 −29
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 */



#include <linux/sched/mm.h>

#include <linux/ktime.h>

#include <linux/hrtimer.h>

#include <linux/export.h>

#include <linux/pm_runtime.h>

#include <linux/pm_wakeirq.h>
@@ -93,7 +95,7 @@ static void __update_runtime_status(struct device *dev, enum rpm_status status) 
static void pm_runtime_deactivate_timer(struct device *dev)

{

	if (dev->power.timer_expires > 0) {

		del_timer(&dev->power.suspend_timer);

		hrtimer_cancel(&dev->power.suspend_timer);

		dev->power.timer_expires = 0;

	}

}
@@ -124,12 +126,11 @@ static void pm_runtime_cancel_pending(struct device *dev) 
 * This function may be called either with or without dev->power.lock held.

 * Either way it can be racy, since power.last_busy may be updated at any time.

 */

unsigned long pm_runtime_autosuspend_expiration(struct device *dev)

u64 pm_runtime_autosuspend_expiration(struct device *dev)

{

	int autosuspend_delay;

	long elapsed;

	unsigned long last_busy;

	unsigned long expires = 0;

	u64 last_busy, expires = 0;

	u64 now = ktime_to_ns(ktime_get());



	if (!dev->power.use_autosuspend)

		goto out;
@@ -139,19 +140,9 @@ unsigned long pm_runtime_autosuspend_expiration(struct device *dev) 
		goto out;



	last_busy = READ_ONCE(dev->power.last_busy);

	elapsed = jiffies - last_busy;

	if (elapsed < 0)

		goto out;	/* jiffies has wrapped around. */



	/*

	 * If the autosuspend_delay is >= 1 second, align the timer by rounding

	 * up to the nearest second.

	 */

	expires = last_busy + msecs_to_jiffies(autosuspend_delay);

	if (autosuspend_delay >= 1000)

		expires = round_jiffies(expires);

	expires += !expires;

	if (elapsed >= expires - last_busy)

	expires = last_busy + autosuspend_delay * NSEC_PER_MSEC;

	if (expires <= now)

		expires = 0;	/* Already expired. */



 out:
@@ -515,7 +506,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
	/* If the autosuspend_delay time hasn't expired yet, reschedule. */

	if ((rpmflags & RPM_AUTO)

	    && dev->power.runtime_status != RPM_SUSPENDING) {

		unsigned long expires = pm_runtime_autosuspend_expiration(dev);

		u64 expires = pm_runtime_autosuspend_expiration(dev);



		if (expires != 0) {

			/* Pending requests need to be canceled. */
@@ -528,10 +519,20 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
			 * expire; pm_suspend_timer_fn() will take care of the

			 * rest.

			 */

			if (!(dev->power.timer_expires && time_before_eq(

			    dev->power.timer_expires, expires))) {

			if (!(dev->power.timer_expires &&

					dev->power.timer_expires <= expires)) {

				/*

				 * We add a slack of 25% to gather wakeups

				 * without sacrificing the granularity.

				 */

				u64 slack = READ_ONCE(dev->power.autosuspend_delay) *

						    (NSEC_PER_MSEC >> 2);



				dev->power.timer_expires = expires;

				mod_timer(&dev->power.suspend_timer, expires);

				hrtimer_start_range_ns(&dev->power.suspend_timer,

						ns_to_ktime(expires),

						slack,

						HRTIMER_MODE_ABS);

			}

			dev->power.timer_autosuspends = 1;

			goto out;
@@ -895,23 +896,25 @@ static void pm_runtime_work(struct work_struct *work) 
 *

 * Check if the time is right and queue a suspend request.

 */

static void pm_suspend_timer_fn(struct timer_list *t)

static enum hrtimer_restart  pm_suspend_timer_fn(struct hrtimer *timer)

{

	struct device *dev = from_timer(dev, t, power.suspend_timer);

	struct device *dev = container_of(timer, struct device, power.suspend_timer);

	unsigned long flags;

	unsigned long expires;

	u64 expires;



	spin_lock_irqsave(&dev->power.lock, flags);



	expires = dev->power.timer_expires;

	/* If 'expire' is after 'jiffies' we've been called too early. */

	if (expires > 0 && !time_after(expires, jiffies)) {

	if (expires > 0 && expires < ktime_to_ns(ktime_get())) {

		dev->power.timer_expires = 0;

		rpm_suspend(dev, dev->power.timer_autosuspends ?

		    (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC);

	}



	spin_unlock_irqrestore(&dev->power.lock, flags);



	return HRTIMER_NORESTART;

}



/**
@@ -922,6 +925,7 @@ static void pm_suspend_timer_fn(struct timer_list *t) 
int pm_schedule_suspend(struct device *dev, unsigned int delay)

{

	unsigned long flags;

	ktime_t expires;

	int retval;



	spin_lock_irqsave(&dev->power.lock, flags);
@@ -938,10 +942,10 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay) 
	/* Other scheduled or pending requests need to be canceled. */

	pm_runtime_cancel_pending(dev);



	dev->power.timer_expires = jiffies + msecs_to_jiffies(delay);

	dev->power.timer_expires += !dev->power.timer_expires;

	expires = ktime_add(ktime_get(), ms_to_ktime(delay));

	dev->power.timer_expires = ktime_to_ns(expires);

	dev->power.timer_autosuspends = 0;

	mod_timer(&dev->power.suspend_timer, dev->power.timer_expires);

	hrtimer_start(&dev->power.suspend_timer, expires, HRTIMER_MODE_ABS);



 out:

	spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -1491,7 +1495,8 @@ void pm_runtime_init(struct device *dev) 
	INIT_WORK(&dev->power.work, pm_runtime_work);



	dev->power.timer_expires = 0;

	timer_setup(&dev->power.suspend_timer, pm_suspend_timer_fn, 0);

	hrtimer_init(&dev->power.suspend_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);

	dev->power.suspend_timer.function = pm_suspend_timer_fn;



	init_waitqueue_head(&dev->power.wait_queue);

}

include/linux/pm.h

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/spinlock.h>

#include <linux/wait.h>

#include <linux/timer.h>

#include <linux/hrtimer.h>

#include <linux/completion.h>



/*
@@ -608,7 +609,7 @@ struct dev_pm_info { 
	unsigned int		should_wakeup:1;

#endif

#ifdef CONFIG_PM

	struct timer_list	suspend_timer;

	struct hrtimer		suspend_timer;

	unsigned long		timer_expires;

	struct work_struct	work;

	wait_queue_head_t	wait_queue;
@@ -631,7 +632,7 @@ struct dev_pm_info { 
	enum rpm_status		runtime_status;

	int			runtime_error;

	int			autosuspend_delay;

	unsigned long		last_busy;

	u64			last_busy;

	unsigned long		active_jiffies;

	unsigned long		suspended_jiffies;

	unsigned long		accounting_timestamp;

include/linux/pm_runtime.h

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ extern void pm_runtime_no_callbacks(struct device *dev); 
extern void pm_runtime_irq_safe(struct device *dev);

extern void __pm_runtime_use_autosuspend(struct device *dev, bool use);

extern void pm_runtime_set_autosuspend_delay(struct device *dev, int delay);

extern unsigned long pm_runtime_autosuspend_expiration(struct device *dev);

extern u64 pm_runtime_autosuspend_expiration(struct device *dev);

extern void pm_runtime_update_max_time_suspended(struct device *dev,

						 s64 delta_ns);

extern void pm_runtime_set_memalloc_noio(struct device *dev, bool enable);
@@ -105,7 +105,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev) 


static inline void pm_runtime_mark_last_busy(struct device *dev)

{

	WRITE_ONCE(dev->power.last_busy, jiffies);

	WRITE_ONCE(dev->power.last_busy, ktime_to_ns(ktime_get()));

}



static inline bool pm_runtime_is_irq_safe(struct device *dev)
@@ -168,7 +168,7 @@ static inline void __pm_runtime_use_autosuspend(struct device *dev, 
						bool use) {}

static inline void pm_runtime_set_autosuspend_delay(struct device *dev,

						int delay) {}

static inline unsigned long pm_runtime_autosuspend_expiration(

static inline u64 pm_runtime_autosuspend_expiration(

				struct device *dev) { return 0; }

static inline void pm_runtime_set_memalloc_noio(struct device *dev,

						bool enable){}

kernel/power/main.c

+2 −13
Original line number Diff line number Diff line
@@ -318,23 +318,12 @@ static int suspend_stats_show(struct seq_file *s, void *unused) 


	return 0;

}



static int suspend_stats_open(struct inode *inode, struct file *file)

{

	return single_open(file, suspend_stats_show, NULL);

}



static const struct file_operations suspend_stats_operations = {

	.open           = suspend_stats_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

	.release        = single_release,

};

DEFINE_SHOW_ATTRIBUTE(suspend_stats);



static int __init pm_debugfs_init(void)

{

	debugfs_create_file("suspend_stats", S_IFREG | S_IRUGO,

			NULL, NULL, &suspend_stats_operations);

			NULL, NULL, &suspend_stats_fops);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE