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

Commit 2d360fcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Suspend: Fix bug in suspend statistics update
  PM / Hibernate: Fix the early termination of test modes
  PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
  PM Sleep: Do not extend wakeup paths to devices with ignore_children set
  PM / driver core: disable device's runtime PM during shutdown
  PM / devfreq: correct Kconfig dependency
  PM / devfreq: fix use after free in devfreq_remove_device
  PM / shmobile: Avoid restoring the INTCS state during initialization
  PM / devfreq: Remove compiler error after irq.h update
  PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
  PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
  ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
  PM / shmobile: Don't skip debugging output in pd_power_up()
parents a767835f 501a708f

arch/arm/mach-shmobile/pm-sh7372.c

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

#include <linux/irq.h>

#include <linux/bitrev.h>

#include <linux/console.h>

#include <asm/system.h>

#include <asm/io.h>

#include <asm/tlbflush.h>
@@ -106,9 +107,8 @@ static int pd_power_down(struct generic_pm_domain *genpd) 
	return 0;

}



static int pd_power_up(struct generic_pm_domain *genpd)

static int __pd_power_up(struct sh7372_pm_domain *sh7372_pd, bool do_resume)

{

	struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);

	unsigned int mask = 1 << sh7372_pd->bit_shift;

	unsigned int retry_count;

	int ret = 0;
@@ -123,13 +123,13 @@ static int pd_power_up(struct generic_pm_domain *genpd) 


	for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {

		if (!(__raw_readl(SWUCR) & mask))

			goto out;

			break;

		if (retry_count > PSTR_RETRIES)

			udelay(PSTR_DELAY_US);

		else

			cpu_relax();

	}

	if (__raw_readl(SWUCR) & mask)

	if (!retry_count)

		ret = -EIO;



	if (!sh7372_pd->no_debug)
@@ -137,12 +137,17 @@ static int pd_power_up(struct generic_pm_domain *genpd) 
			 mask, __raw_readl(PSTR));



 out:

	if (ret == 0 && sh7372_pd->resume)

	if (ret == 0 && sh7372_pd->resume && do_resume)

		sh7372_pd->resume();



	return ret;

}



static int pd_power_up(struct generic_pm_domain *genpd)

{

	 return __pd_power_up(to_sh7372_pd(genpd), true);

}



static void sh7372_a4r_suspend(void)

{

	sh7372_intcs_suspend();
@@ -174,7 +179,7 @@ void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd) 
	genpd->active_wakeup = pd_active_wakeup;

	genpd->power_off = pd_power_down;

	genpd->power_on = pd_power_up;

	genpd->power_on(&sh7372_pd->genpd);

	__pd_power_up(sh7372_pd, false);

}



void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
@@ -227,11 +232,23 @@ struct sh7372_pm_domain sh7372_a3sp = { 
	.no_debug = true,

};



static void sh7372_a3sp_init(void)

{

	/* serial consoles make use of SCIF hardware located in A3SP,

	 * keep such power domain on if "no_console_suspend" is set.

	 */

	sh7372_a3sp.stay_on = !console_suspend_enabled;

}



struct sh7372_pm_domain sh7372_a3sg = {

	.bit_shift = 13,

};



#endif /* CONFIG_PM */

#else /* !CONFIG_PM */



static inline void sh7372_a3sp_init(void) {}



#endif /* !CONFIG_PM */



#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)

static int sh7372_do_idle_core_standby(unsigned long unused)
@@ -465,6 +482,8 @@ void __init sh7372_pm_init(void) 
	/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */

	__raw_writel(0, PDNSEL);



	sh7372_a3sp_init();



	sh7372_suspend_init();

	sh7372_cpuidle_init();

}

drivers/base/core.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/kallsyms.h>

#include <linux/mutex.h>

#include <linux/async.h>

#include <linux/pm_runtime.h>



#include "base.h"

#include "power/power.h"
@@ -1742,6 +1743,8 @@ void device_shutdown(void) 
		 */

		list_del_init(&dev->kobj.entry);

		spin_unlock(&devices_kset->list_lock);

		/* Disable all device's runtime power management */

		pm_runtime_disable(dev);



		if (dev->bus && dev->bus->shutdown) {

			dev_dbg(dev, "shutdown\n");

drivers/base/power/clock_ops.c

+2 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ int pm_clk_suspend(struct device *dev) 


	list_for_each_entry_reverse(ce, &psd->clock_list, node) {

		if (ce->status < PCE_STATUS_ERROR) {

			if (ce->status == PCE_STATUS_ENABLED)

				clk_disable(ce->clk);

			ce->status = PCE_STATUS_ACQUIRED;

		}

drivers/base/power/main.c

+2 −1
Original line number Diff line number Diff line
@@ -920,7 +920,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) 
 End:

	if (!error) {

		dev->power.is_suspended = true;

		if (dev->power.wakeup_path && dev->parent)

		if (dev->power.wakeup_path

		    && dev->parent && !dev->parent->power.ignore_children)

			dev->parent->power.wakeup_path = true;

	}

drivers/base/power/qos.c

+6 −12
Original line number Diff line number Diff line
@@ -212,11 +212,9 @@ int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, 
	if (!dev || !req) /*guard against callers passing in null */

		return -EINVAL;



	if (dev_pm_qos_request_active(req)) {

		WARN(1, KERN_ERR "dev_pm_qos_add_request() called for already "

			"added request\n");

	if (WARN(dev_pm_qos_request_active(req),

		 "%s() called for already added request\n", __func__))

		return -EINVAL;

	}



	req->dev = dev;
@@ -271,11 +269,9 @@ int dev_pm_qos_update_request(struct dev_pm_qos_request *req, 
	if (!req) /*guard against callers passing in null */

		return -EINVAL;



	if (!dev_pm_qos_request_active(req)) {

		WARN(1, KERN_ERR "dev_pm_qos_update_request() called for "

			"unknown object\n");

	if (WARN(!dev_pm_qos_request_active(req),

		 "%s() called for unknown object\n", __func__))

		return -EINVAL;

	}



	mutex_lock(&dev_pm_qos_mtx);
@@ -312,11 +308,9 @@ int dev_pm_qos_remove_request(struct dev_pm_qos_request *req) 
	if (!req) /*guard against callers passing in null */

		return -EINVAL;



	if (!dev_pm_qos_request_active(req)) {

		WARN(1, KERN_ERR "dev_pm_qos_remove_request() called for "

			"unknown object\n");

	if (WARN(!dev_pm_qos_request_active(req),

		 "%s() called for unknown object\n", __func__))

		return -EINVAL;

	}



	mutex_lock(&dev_pm_qos_mtx);