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

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

* pm-sleep:
  PM: sleep: Add dev_wakeup_path() helper
  PM / suspend: fix kernel-doc markup
  PM: sleep: Print driver flags for all devices during suspend/resume

* pm-acpi:
  PM: ACPI: Refresh wakeup device power configuration every time
  PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup()
  PM: ACPI: reboot: Use S5 for reboot

* pm-domains:
  PM: domains: create debugfs nodes when adding power domains
  PM: domains: replace -ENOTSUPP with -EOPNOTSUPP

* powercap:
  powercap: Adjust printing the constraint name with new line
  powercap: RAPL: Add AMD Fam19h RAPL support
  powercap: Add AMD Fam17h RAPL support
  powercap/intel_rapl_msr: Convert rapl_msr_priv into pointer
  x86/msr-index: sort AMD RAPL MSRs by address
parents 4c5744a0 4e1d9a73 b93b7ef6 718072ce b4ba76fb

arch/x86/include/asm/msr-index.h

+2 −1
Original line number Diff line number Diff line
@@ -326,8 +326,9 @@ 
#define MSR_PP1_ENERGY_STATUS		0x00000641

#define MSR_PP1_POLICY			0x00000642



#define MSR_AMD_PKG_ENERGY_STATUS	0xc001029b

#define MSR_AMD_RAPL_POWER_UNIT		0xc0010299

#define MSR_AMD_CORE_ENERGY_STATUS		0xc001029a

#define MSR_AMD_PKG_ENERGY_STATUS	0xc001029b



/* Config TDP MSRs */

#define MSR_CONFIG_TDP_NOMINAL		0x00000648

drivers/acpi/device_pm.c

+29 −33
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static void acpi_pm_notify_work_func(struct acpi_device_wakeup_context *context) 
static DEFINE_MUTEX(acpi_wakeup_lock);



static int __acpi_device_wakeup_enable(struct acpi_device *adev,

				       u32 target_state, int max_count)

				       u32 target_state)

{

	struct acpi_device_wakeup *wakeup = &adev->wakeup;

	acpi_status status;
@@ -757,15 +757,26 @@ static int __acpi_device_wakeup_enable(struct acpi_device *adev, 


	mutex_lock(&acpi_wakeup_lock);



	if (wakeup->enable_count >= max_count)

		goto out;



	/*

	 * If the device wakeup power is already enabled, disable it and enable

	 * it again in case it depends on the configuration of subordinate

	 * devices and the conditions have changed since it was enabled last

	 * time.

	 */

	if (wakeup->enable_count > 0)

		goto inc;

		acpi_disable_wakeup_device_power(adev);



	error = acpi_enable_wakeup_device_power(adev, target_state);

	if (error)

	if (error) {

		if (wakeup->enable_count > 0) {

			acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);

			wakeup->enable_count = 0;

		}

		goto out;

	}



	if (wakeup->enable_count > 0)

		goto inc;



	status = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);

	if (ACPI_FAILURE(status)) {
@@ -778,7 +789,10 @@ static int __acpi_device_wakeup_enable(struct acpi_device *adev, 
			  (unsigned int)wakeup->gpe_number);



inc:

	if (wakeup->enable_count < INT_MAX)

		wakeup->enable_count++;

	else

		acpi_handle_info(adev->handle, "Wakeup enable count out of bounds!\n");



out:

	mutex_unlock(&acpi_wakeup_lock);
@@ -799,7 +813,7 @@ out: 
 */

static int acpi_device_wakeup_enable(struct acpi_device *adev, u32 target_state)

{

	return __acpi_device_wakeup_enable(adev, target_state, 1);

	return __acpi_device_wakeup_enable(adev, target_state);

}



/**
@@ -829,8 +843,12 @@ out: 
	mutex_unlock(&acpi_wakeup_lock);

}



static int __acpi_pm_set_device_wakeup(struct device *dev, bool enable,

				       int max_count)

/**

 * acpi_pm_set_device_wakeup - Enable/disable remote wakeup for given device.

 * @dev: Device to enable/disable to generate wakeup events.

 * @enable: Whether to enable or disable the wakeup functionality.

 */

int acpi_pm_set_device_wakeup(struct device *dev, bool enable)

{

	struct acpi_device *adev;

	int error;
@@ -850,36 +868,14 @@ static int __acpi_pm_set_device_wakeup(struct device *dev, bool enable, 
		return 0;

	}



	error = __acpi_device_wakeup_enable(adev, acpi_target_system_state(),

					    max_count);

	error = __acpi_device_wakeup_enable(adev, acpi_target_system_state());

	if (!error)

		dev_dbg(dev, "Wakeup enabled by ACPI\n");



	return error;

}



/**

 * acpi_pm_set_device_wakeup - Enable/disable remote wakeup for given device.

 * @dev: Device to enable/disable to generate wakeup events.

 * @enable: Whether to enable or disable the wakeup functionality.

 */

int acpi_pm_set_device_wakeup(struct device *dev, bool enable)

{

	return __acpi_pm_set_device_wakeup(dev, enable, 1);

}

EXPORT_SYMBOL_GPL(acpi_pm_set_device_wakeup);



/**

 * acpi_pm_set_bridge_wakeup - Enable/disable remote wakeup for given bridge.

 * @dev: Bridge device to enable/disable to generate wakeup events.

 * @enable: Whether to enable or disable the wakeup functionality.

 */

int acpi_pm_set_bridge_wakeup(struct device *dev, bool enable)

{

	return __acpi_pm_set_device_wakeup(dev, enable, INT_MAX);

}

EXPORT_SYMBOL_GPL(acpi_pm_set_bridge_wakeup);



/**

 * acpi_dev_pm_low_power - Put ACPI device into a low-power state.

 * @dev: Device to put into a low-power state.

drivers/base/power/domain.c

+47 −30
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/suspend.h>

#include <linux/export.h>

#include <linux/cpu.h>

#include <linux/debugfs.h>



#include "power.h"
@@ -210,6 +211,18 @@ static void genpd_sd_counter_inc(struct generic_pm_domain *genpd) 
}



#ifdef CONFIG_DEBUG_FS

static struct dentry *genpd_debugfs_dir;



static void genpd_debug_add(struct generic_pm_domain *genpd);



static void genpd_debug_remove(struct generic_pm_domain *genpd)

{

	struct dentry *d;



	d = debugfs_lookup(genpd->name, genpd_debugfs_dir);

	debugfs_remove(d);

}



static void genpd_update_accounting(struct generic_pm_domain *genpd)

{

	ktime_t delta, now;
@@ -234,6 +247,8 @@ static void genpd_update_accounting(struct generic_pm_domain *genpd) 
	genpd->accounting_time = now;

}

#else

static inline void genpd_debug_add(struct generic_pm_domain *genpd) {}

static inline void genpd_debug_remove(struct generic_pm_domain *genpd) {}

static inline void genpd_update_accounting(struct generic_pm_domain *genpd) {}

#endif
@@ -1142,7 +1157,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff) 
	if (ret)

		return ret;



	if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))

	if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd))

		return 0;



	if (genpd->dev_ops.stop && genpd->dev_ops.start &&
@@ -1196,7 +1211,7 @@ static int genpd_resume_noirq(struct device *dev) 
	if (IS_ERR(genpd))

		return -EINVAL;



	if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))

	if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd))

		return pm_generic_resume_noirq(dev);



	genpd_lock(genpd);
@@ -1973,6 +1988,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, 


	mutex_lock(&gpd_list_lock);

	list_add(&genpd->gpd_list_node, &gpd_list);

	genpd_debug_add(genpd);

	mutex_unlock(&gpd_list_lock);



	return 0;
@@ -2006,6 +2022,7 @@ static int genpd_remove(struct generic_pm_domain *genpd) 
		kfree(link);

	}



	genpd_debug_remove(genpd);

	list_del(&genpd->gpd_list_node);

	genpd_unlock(genpd);

	cancel_work_sync(&genpd->power_off_work);
@@ -2912,14 +2929,6 @@ core_initcall(genpd_bus_init); 
/***        debugfs support        ***/



#ifdef CONFIG_DEBUG_FS

#include <linux/pm.h>

#include <linux/device.h>

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/kobject.h>

static struct dentry *genpd_debugfs_dir;



/*

 * TODO: This function is a slightly modified version of rtpm_status_show

 * from sysfs.c, so generalize it.
@@ -3196,17 +3205,13 @@ DEFINE_SHOW_ATTRIBUTE(total_idle_time); 
DEFINE_SHOW_ATTRIBUTE(devices);

DEFINE_SHOW_ATTRIBUTE(perf_state);



static int __init genpd_debug_init(void)

static void genpd_debug_add(struct generic_pm_domain *genpd)

{

	struct dentry *d;

	struct generic_pm_domain *genpd;



	genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL);



	debugfs_create_file("pm_genpd_summary", S_IRUGO, genpd_debugfs_dir,

			    NULL, &summary_fops);

	if (!genpd_debugfs_dir)

		return;



	list_for_each_entry(genpd, &gpd_list, gpd_list_node) {

	d = debugfs_create_dir(genpd->name, genpd_debugfs_dir);



	debugfs_create_file("current_state", 0444,
@@ -3226,6 +3231,18 @@ static int __init genpd_debug_init(void) 
				    d, genpd, &perf_state_fops);

}



static int __init genpd_debug_init(void)

{

	struct generic_pm_domain *genpd;



	genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL);



	debugfs_create_file("pm_genpd_summary", S_IRUGO, genpd_debugfs_dir,

			    NULL, &summary_fops);



	list_for_each_entry(genpd, &gpd_list, gpd_list_node)

		genpd_debug_add(genpd);



	return 0;

}

late_initcall(genpd_debug_init);

drivers/base/power/main.c

+4 −4
Original line number Diff line number Diff line
@@ -441,9 +441,9 @@ static pm_callback_t pm_noirq_op(const struct dev_pm_ops *ops, pm_message_t stat 


static void pm_dev_dbg(struct device *dev, pm_message_t state, const char *info)

{

	dev_dbg(dev, "%s%s%s\n", info, pm_verb(state.event),

	dev_dbg(dev, "%s%s%s driver flags: %x\n", info, pm_verb(state.event),

		((state.event & PM_EVENT_SLEEP) && device_may_wakeup(dev)) ?

		", may wakeup" : "");

		", may wakeup" : "", dev->power.driver_flags);

}



static void pm_dev_err(struct device *dev, pm_message_t state, const char *info,
@@ -1359,7 +1359,7 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev) 


	spin_lock_irq(&parent->power.lock);



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

	if (device_wakeup_path(dev) && !parent->power.ignore_children)

		parent->power.wakeup_path = true;



	spin_unlock_irq(&parent->power.lock);
@@ -1627,7 +1627,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) 
		goto Complete;



	/* Avoid direct_complete to let wakeup_path propagate. */

	if (device_may_wakeup(dev) || dev->power.wakeup_path)

	if (device_may_wakeup(dev) || device_wakeup_path(dev))

		dev->power.direct_complete = false;



	if (dev->power.direct_complete) {

drivers/i2c/busses/i2c-stm32f7.c

+2 −2
Original line number Diff line number Diff line
@@ -2322,7 +2322,7 @@ static int stm32f7_i2c_suspend(struct device *dev) 


	i2c_mark_adapter_suspended(&i2c_dev->adap);



	if (!device_may_wakeup(dev) && !dev->power.wakeup_path) {

	if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) {

		ret = stm32f7_i2c_regs_backup(i2c_dev);

		if (ret < 0) {

			i2c_mark_adapter_resumed(&i2c_dev->adap);
@@ -2341,7 +2341,7 @@ static int stm32f7_i2c_resume(struct device *dev) 
	struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);

	int ret;



	if (!device_may_wakeup(dev) && !dev->power.wakeup_path) {

	if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) {

		ret = pm_runtime_force_resume(dev);

		if (ret < 0)

			return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE