37530f2bda
Device PM QoS sysfs attributes, if present during device removal, are removed from within device_pm_remove(), which is too late, since dpm_sysfs_remove() has already removed the whole attribute group they belonged to. However, moving the removal of those attributes to dpm_sysfs_remove() alone is not sufficient, because in theory they still can be re-added right after being removed by it (the device's driver is still bound to it at that point). For this reason, move the entire desctruction of device PM QoS constraints to dpm_sysfs_remove() and make it prevent any new constraints from being added after it has run. Also, move the initialization of the power.qos field in struct device to device_pm_init_common() and drop the no longer needed dev_pm_qos_constraints_init(). Reported-by: Sasha Levin <sasha.levin@oracle.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
108 lines
3.0 KiB
C
108 lines
3.0 KiB
C
#include <linux/pm_qos.h>
|
|
|
|
static inline void device_pm_init_common(struct device *dev)
|
|
{
|
|
if (!dev->power.early_init) {
|
|
spin_lock_init(&dev->power.lock);
|
|
dev->power.qos = NULL;
|
|
dev->power.early_init = true;
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_PM_RUNTIME
|
|
|
|
static inline void pm_runtime_early_init(struct device *dev)
|
|
{
|
|
dev->power.disable_depth = 1;
|
|
device_pm_init_common(dev);
|
|
}
|
|
|
|
extern void pm_runtime_init(struct device *dev);
|
|
extern void pm_runtime_remove(struct device *dev);
|
|
|
|
#else /* !CONFIG_PM_RUNTIME */
|
|
|
|
static inline void pm_runtime_early_init(struct device *dev)
|
|
{
|
|
device_pm_init_common(dev);
|
|
}
|
|
|
|
static inline void pm_runtime_init(struct device *dev) {}
|
|
static inline void pm_runtime_remove(struct device *dev) {}
|
|
|
|
#endif /* !CONFIG_PM_RUNTIME */
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
|
|
/* kernel/power/main.c */
|
|
extern int pm_async_enabled;
|
|
|
|
/* drivers/base/power/main.c */
|
|
extern struct list_head dpm_list; /* The active device list */
|
|
|
|
static inline struct device *to_device(struct list_head *entry)
|
|
{
|
|
return container_of(entry, struct device, power.entry);
|
|
}
|
|
|
|
extern void device_pm_sleep_init(struct device *dev);
|
|
extern void device_pm_add(struct device *);
|
|
extern void device_pm_remove(struct device *);
|
|
extern void device_pm_move_before(struct device *, struct device *);
|
|
extern void device_pm_move_after(struct device *, struct device *);
|
|
extern void device_pm_move_last(struct device *);
|
|
|
|
#else /* !CONFIG_PM_SLEEP */
|
|
|
|
static inline void device_pm_sleep_init(struct device *dev) {}
|
|
|
|
static inline void device_pm_add(struct device *dev) {}
|
|
|
|
static inline void device_pm_remove(struct device *dev)
|
|
{
|
|
pm_runtime_remove(dev);
|
|
}
|
|
|
|
static inline void device_pm_move_before(struct device *deva,
|
|
struct device *devb) {}
|
|
static inline void device_pm_move_after(struct device *deva,
|
|
struct device *devb) {}
|
|
static inline void device_pm_move_last(struct device *dev) {}
|
|
|
|
#endif /* !CONFIG_PM_SLEEP */
|
|
|
|
static inline void device_pm_init(struct device *dev)
|
|
{
|
|
device_pm_init_common(dev);
|
|
device_pm_sleep_init(dev);
|
|
pm_runtime_init(dev);
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
/*
|
|
* sysfs.c
|
|
*/
|
|
|
|
extern int dpm_sysfs_add(struct device *dev);
|
|
extern void dpm_sysfs_remove(struct device *dev);
|
|
extern void rpm_sysfs_remove(struct device *dev);
|
|
extern int wakeup_sysfs_add(struct device *dev);
|
|
extern void wakeup_sysfs_remove(struct device *dev);
|
|
extern int pm_qos_sysfs_add_latency(struct device *dev);
|
|
extern void pm_qos_sysfs_remove_latency(struct device *dev);
|
|
extern int pm_qos_sysfs_add_flags(struct device *dev);
|
|
extern void pm_qos_sysfs_remove_flags(struct device *dev);
|
|
|
|
#else /* CONFIG_PM */
|
|
|
|
static inline int dpm_sysfs_add(struct device *dev) { return 0; }
|
|
static inline void dpm_sysfs_remove(struct device *dev) {}
|
|
static inline void rpm_sysfs_remove(struct device *dev) {}
|
|
static inline int wakeup_sysfs_add(struct device *dev) { return 0; }
|
|
static inline void wakeup_sysfs_remove(struct device *dev) {}
|
|
static inline int pm_qos_sysfs_add(struct device *dev) { return 0; }
|
|
static inline void pm_qos_sysfs_remove(struct device *dev) {}
|
|
|
|
#endif
|