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

Merge branches 'pm-sleep', 'pm-domains', 'pm-opp' and 'powercap' 

* pm-sleep:
  PM / wakeirq: remove unnecessary parentheses
  PM / core: Clean up some function headers in power.h
  PM / hibernate: memory_bm_find_bit(): Tighten node optimisation

* pm-domains:
  PM / Domains: Convert to dev_to_genpd_safe() in genpd_syscore_switch()
  mmc: tmio: Avoid boilerplate code in ->runtime_suspend()
  PM / Domains: Implement the ->start() callback for genpd
  PM / Domains: Introduce dev_pm_domain_start()

* pm-opp:
  PM / OPP: Support adjusting OPP voltages at runtime

* powercap:
  powercap/intel_rapl: add support for Cometlake desktop
  powercap/intel_rapl: add support for CometLake Mobile
parents fa6a599e 01ca4827 fe0c2baa 16c71c51 f84fdcbc

drivers/base/power/common.c

+20 −0
Original line number Diff line number Diff line
@@ -187,6 +187,26 @@ void dev_pm_domain_detach(struct device *dev, bool power_off) 
}

EXPORT_SYMBOL_GPL(dev_pm_domain_detach);



/**

 * dev_pm_domain_start - Start the device through its PM domain.

 * @dev: Device to start.

 *

 * This function should typically be called during probe by a subsystem/driver,

 * when it needs to start its device from the PM domain's perspective. Note

 * that, it's assumed that the PM domain is already powered on when this

 * function is called.

 *

 * Returns 0 on success and negative error values on failures.

 */

int dev_pm_domain_start(struct device *dev)

{

	if (dev->pm_domain && dev->pm_domain->start)

		return dev->pm_domain->start(dev);



	return 0;

}

EXPORT_SYMBOL_GPL(dev_pm_domain_start);



/**

 * dev_pm_domain_set - Set PM domain of a device.

 * @dev: Device whose PM domain is to be set.

drivers/base/power/domain.c

+20 −20
Original line number Diff line number Diff line
@@ -634,6 +634,13 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth) 
	return ret;

}



static int genpd_dev_pm_start(struct device *dev)

{

	struct generic_pm_domain *genpd = dev_to_genpd(dev);



	return genpd_start_dev(genpd, dev);

}



static int genpd_dev_pm_qos_notifier(struct notifier_block *nb,

				     unsigned long val, void *ptr)

{
@@ -922,24 +929,6 @@ static int __init genpd_power_off_unused(void) 
}

late_initcall(genpd_power_off_unused);



#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_GENERIC_DOMAINS_OF)



static bool genpd_present(const struct generic_pm_domain *genpd)

{

	const struct generic_pm_domain *gpd;



	if (IS_ERR_OR_NULL(genpd))

		return false;



	list_for_each_entry(gpd, &gpd_list, gpd_list_node)

		if (gpd == genpd)

			return true;



	return false;

}



#endif



#ifdef CONFIG_PM_SLEEP



/**
@@ -1354,8 +1343,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) 
{

	struct generic_pm_domain *genpd;



	genpd = dev_to_genpd(dev);

	if (!genpd_present(genpd))

	genpd = dev_to_genpd_safe(dev);

	if (!genpd)

		return;



	if (suspend) {
@@ -1805,6 +1794,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, 
	genpd->domain.ops.poweroff_noirq = genpd_poweroff_noirq;

	genpd->domain.ops.restore_noirq = genpd_restore_noirq;

	genpd->domain.ops.complete = genpd_complete;

	genpd->domain.start = genpd_dev_pm_start;



	if (genpd->flags & GENPD_FLAG_PM_CLK) {

		genpd->dev_ops.stop = pm_clk_suspend;
@@ -2020,6 +2010,16 @@ static int genpd_add_provider(struct device_node *np, genpd_xlate_t xlate, 
	return 0;

}



static bool genpd_present(const struct generic_pm_domain *genpd)

{

	const struct generic_pm_domain *gpd;



	list_for_each_entry(gpd, &gpd_list, gpd_list_node)

		if (gpd == genpd)

			return true;

	return false;

}



/**

 * of_genpd_add_provider_simple() - Register a simple PM domain provider

 * @np: Device node pointer associated with the PM domain provider.

drivers/base/power/power.h

+12 −18
Original line number Diff line number Diff line
@@ -117,6 +117,13 @@ static inline bool device_pm_initialized(struct device *dev) 
	return dev->power.in_dpm_list;

}



/* drivers/base/power/wakeup_stats.c */

extern int wakeup_source_sysfs_add(struct device *parent,

				   struct wakeup_source *ws);

extern void wakeup_source_sysfs_remove(struct wakeup_source *ws);



extern int pm_wakeup_source_sysfs_add(struct device *parent);



#else /* !CONFIG_PM_SLEEP */



static inline void device_pm_sleep_init(struct device *dev) {}
@@ -141,6 +148,11 @@ static inline bool device_pm_initialized(struct device *dev) 
	return device_is_registered(dev);

}



static inline int pm_wakeup_source_sysfs_add(struct device *parent)

{

	return 0;

}



#endif /* !CONFIG_PM_SLEEP */



static inline void device_pm_init(struct device *dev)
@@ -149,21 +161,3 @@ static inline void device_pm_init(struct device *dev) 
	device_pm_sleep_init(dev);

	pm_runtime_init(dev);

}
 


#ifdef CONFIG_PM_SLEEP



/* drivers/base/power/wakeup_stats.c */

extern int wakeup_source_sysfs_add(struct device *parent,

				   struct wakeup_source *ws);

extern void wakeup_source_sysfs_remove(struct wakeup_source *ws);



extern int pm_wakeup_source_sysfs_add(struct device *parent);



#else /* !CONFIG_PM_SLEEP */



static inline int pm_wakeup_source_sysfs_add(struct device *parent)

{

	return 0;

}



#endif /* CONFIG_PM_SLEEP */

drivers/base/power/wakeirq.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void dev_pm_enable_wake_irq_check(struct device *dev, 
{

	struct wake_irq *wirq = dev->power.wakeirq;



	if (!wirq || !((wirq->status & WAKE_IRQ_DEDICATED_MASK)))

	if (!wirq || !(wirq->status & WAKE_IRQ_DEDICATED_MASK))

		return;



	if (likely(wirq->status & WAKE_IRQ_DEDICATED_MANAGED)) {
@@ -299,7 +299,7 @@ void dev_pm_disable_wake_irq_check(struct device *dev) 
{

	struct wake_irq *wirq = dev->power.wakeirq;



	if (!wirq || !((wirq->status & WAKE_IRQ_DEDICATED_MASK)))

	if (!wirq || !(wirq->status & WAKE_IRQ_DEDICATED_MASK))

		return;



	if (wirq->status & WAKE_IRQ_DEDICATED_MANAGED)

drivers/mmc/host/tmio_mmc.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ struct tmio_mmc_host { 
	unsigned long		last_req_ts;

	struct mutex		ios_lock;	/* protect set_ios() context */

	bool			native_hotplug;

	bool			runtime_synced;

	bool			sdio_irq_enabled;



	/* Mandatory callback */

CRA Git | Maintained and supported by SUSTech CRA and CCSE