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

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

PM: Introduce struct pm_subsys_data 



Introduce struct pm_subsys_data that may be subclassed by subsystems
to store subsystem-specific information related to the device.  Move
the clock management fields accessed through the power.subsys_data
pointer in struct device to the new strucutre.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 111058c3

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -115,7 +115,7 @@ void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd, 
	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;





	if (!dev->power.subsys_data) {

	if (!dev->power.subsys_data) {

		pm_clk_init(dev);

		pm_clk_create(dev);

		pm_clk_add(dev, NULL);

		pm_clk_add(dev, NULL);

	}

	}

	pm_genpd_add_device(&sh7372_pd->genpd, dev);

	pm_genpd_add_device(&sh7372_pd->genpd, dev);

drivers/base/power/clock_ops.c

+64 −58
Original line number Original line Diff line number Diff line
@@ -17,11 +17,6 @@ 




#ifdef CONFIG_PM

#ifdef CONFIG_PM





struct pm_clk_data {

	struct list_head clock_list;

	spinlock_t lock;

};



enum pce_status {

enum pce_status {

	PCE_STATUS_NONE = 0,

	PCE_STATUS_NONE = 0,

	PCE_STATUS_ACQUIRED,

	PCE_STATUS_ACQUIRED,
@@ -36,11 +31,6 @@ struct pm_clock_entry { 
	enum pce_status status;

	enum pce_status status;

};

};





static struct pm_clk_data *__to_pcd(struct device *dev)

{

	return dev ? dev->power.subsys_data : NULL;

}



/**

/**

 * pm_clk_add - Start using a device clock for power management.

 * pm_clk_add - Start using a device clock for power management.

 * @dev: Device whose clock is going to be used for power management.

 * @dev: Device whose clock is going to be used for power management.
@@ -51,10 +41,10 @@ static struct pm_clk_data *__to_pcd(struct device *dev) 
 */

 */

int pm_clk_add(struct device *dev, const char *con_id)

int pm_clk_add(struct device *dev, const char *con_id)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;





	if (!pcd)

	if (!psd)

		return -EINVAL;

		return -EINVAL;





	ce = kzalloc(sizeof(*ce), GFP_KERNEL);

	ce = kzalloc(sizeof(*ce), GFP_KERNEL);
@@ -73,9 +63,9 @@ int pm_clk_add(struct device *dev, const char *con_id) 
		}

		}

	}

	}





	spin_lock_irq(&pcd->lock);

	spin_lock_irq(&psd->lock);

	list_add_tail(&ce->node, &pcd->clock_list);

	list_add_tail(&ce->node, &psd->clock_list);

	spin_unlock_irq(&pcd->lock);

	spin_unlock_irq(&psd->lock);

	return 0;

	return 0;

}

}
@@ -117,15 +107,15 @@ static void __pm_clk_remove(struct pm_clock_entry *ce) 
 */

 */

void pm_clk_remove(struct device *dev, const char *con_id)

void pm_clk_remove(struct device *dev, const char *con_id)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;





	if (!pcd)

	if (!psd)

		return;

		return;





	spin_lock_irq(&pcd->lock);

	spin_lock_irq(&psd->lock);





	list_for_each_entry(ce, &pcd->clock_list, node) {

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

		if (!con_id && !ce->con_id) {

		if (!con_id && !ce->con_id) {

			__pm_clk_remove(ce);

			__pm_clk_remove(ce);

			break;

			break;
@@ -137,29 +127,45 @@ void pm_clk_remove(struct device *dev, const char *con_id) 
		}

		}

	}

	}





	spin_unlock_irq(&pcd->lock);

	spin_unlock_irq(&psd->lock);

}

}





/**

/**

 * pm_clk_init - Initialize a device's list of power management clocks.

 * pm_clk_init - Initialize a device's list of power management clocks.

 * @dev: Device to initialize the list of PM clocks for.

 * @dev: Device to initialize the list of PM clocks for.

 *

 *

 * Allocate a struct pm_clk_data object, initialize its lock member and

 * Initialize the lock and clock_list members of the device's pm_subsys_data

 * make the @dev's power.subsys_data field point to it.

 * object.

 */

 */

int pm_clk_init(struct device *dev)

void pm_clk_init(struct device *dev)

{

{

	struct pm_clk_data *pcd;

	struct pm_subsys_data *psd = dev_to_psd(dev);



	if (!psd)

		return;





	pcd = kzalloc(sizeof(*pcd), GFP_KERNEL);

	INIT_LIST_HEAD(&psd->clock_list);

	if (!pcd) {

	spin_lock_init(&psd->lock);

}



/**

 * pm_clk_create - Create and initialize a device's list of PM clocks.

 * @dev: Device to create and initialize the list of PM clocks for.

 *

 * Allocate a struct pm_subsys_data object, initialize its lock and clock_list

 * members and make the @dev's power.subsys_data field point to it.

 */

int pm_clk_create(struct device *dev)

{

	struct pm_subsys_data *psd;



	psd = kzalloc(sizeof(*psd), GFP_KERNEL);

	if (!psd) {

		dev_err(dev, "Not enough memory for PM clock data.\n");

		dev_err(dev, "Not enough memory for PM clock data.\n");

		return -ENOMEM;

		return -ENOMEM;

	}

	}



	dev->power.subsys_data = psd;

	INIT_LIST_HEAD(&pcd->clock_list);

	pm_clk_init(dev);

	spin_lock_init(&pcd->lock);

	dev->power.subsys_data = pcd;

	return 0;

	return 0;

}

}
@@ -168,27 +174,27 @@ int pm_clk_init(struct device *dev) 
 * @dev: Device to destroy the list of PM clocks for.

 * @dev: Device to destroy the list of PM clocks for.

 *

 *

 * Clear the @dev's power.subsys_data field, remove the list of clock entries

 * Clear the @dev's power.subsys_data field, remove the list of clock entries

 * from the struct pm_clk_data object pointed to by it before and free

 * from the struct pm_subsys_data object pointed to by it before and free

 * that object.

 * that object.

 */

 */

void pm_clk_destroy(struct device *dev)

void pm_clk_destroy(struct device *dev)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce, *c;

	struct pm_clock_entry *ce, *c;





	if (!pcd)

	if (!psd)

		return;

		return;





	dev->power.subsys_data = NULL;

	dev->power.subsys_data = NULL;





	spin_lock_irq(&pcd->lock);

	spin_lock_irq(&psd->lock);





	list_for_each_entry_safe_reverse(ce, c, &pcd->clock_list, node)

	list_for_each_entry_safe_reverse(ce, c, &psd->clock_list, node)

		__pm_clk_remove(ce);

		__pm_clk_remove(ce);





	spin_unlock_irq(&pcd->lock);

	spin_unlock_irq(&psd->lock);





	kfree(pcd);

	kfree(psd);

}

}





#endif /* CONFIG_PM */

#endif /* CONFIG_PM */
@@ -218,18 +224,18 @@ static void pm_clk_acquire(struct device *dev, 
 */

 */

int pm_clk_suspend(struct device *dev)

int pm_clk_suspend(struct device *dev)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;

	unsigned long flags;

	unsigned long flags;





	dev_dbg(dev, "%s()\n", __func__);

	dev_dbg(dev, "%s()\n", __func__);





	if (!pcd)

	if (!psd)

		return 0;

		return 0;





	spin_lock_irqsave(&pcd->lock, flags);

	spin_lock_irqsave(&psd->lock, flags);





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

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

		if (ce->status == PCE_STATUS_NONE)

		if (ce->status == PCE_STATUS_NONE)

			pm_clk_acquire(dev, ce);

			pm_clk_acquire(dev, ce);
@@ -239,7 +245,7 @@ int pm_clk_suspend(struct device *dev) 
		}

		}

	}

	}





	spin_unlock_irqrestore(&pcd->lock, flags);

	spin_unlock_irqrestore(&psd->lock, flags);





	return 0;

	return 0;

}

}
@@ -250,18 +256,18 @@ int pm_clk_suspend(struct device *dev) 
 */

 */

int pm_clk_resume(struct device *dev)

int pm_clk_resume(struct device *dev)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;

	unsigned long flags;

	unsigned long flags;





	dev_dbg(dev, "%s()\n", __func__);

	dev_dbg(dev, "%s()\n", __func__);





	if (!pcd)

	if (!psd)

		return 0;

		return 0;





	spin_lock_irqsave(&pcd->lock, flags);

	spin_lock_irqsave(&psd->lock, flags);





	list_for_each_entry(ce, &pcd->clock_list, node) {

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

		if (ce->status == PCE_STATUS_NONE)

		if (ce->status == PCE_STATUS_NONE)

			pm_clk_acquire(dev, ce);

			pm_clk_acquire(dev, ce);
@@ -271,7 +277,7 @@ int pm_clk_resume(struct device *dev) 
		}

		}

	}

	}





	spin_unlock_irqrestore(&pcd->lock, flags);

	spin_unlock_irqrestore(&psd->lock, flags);





	return 0;

	return 0;

}

}
@@ -309,7 +315,7 @@ static int pm_clk_notify(struct notifier_block *nb, 
		if (dev->pm_domain)

		if (dev->pm_domain)

			break;

			break;





		error = pm_clk_init(dev);

		error = pm_clk_create(dev);

		if (error)

		if (error)

			break;

			break;
@@ -344,22 +350,22 @@ static int pm_clk_notify(struct notifier_block *nb, 
 */

 */

int pm_clk_suspend(struct device *dev)

int pm_clk_suspend(struct device *dev)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;

	unsigned long flags;

	unsigned long flags;





	dev_dbg(dev, "%s()\n", __func__);

	dev_dbg(dev, "%s()\n", __func__);





	/* If there is no driver, the clocks are already disabled. */

	/* If there is no driver, the clocks are already disabled. */

	if (!pcd || !dev->driver)

	if (!psd || !dev->driver)

		return 0;

		return 0;





	spin_lock_irqsave(&pcd->lock, flags);

	spin_lock_irqsave(&psd->lock, flags);





	list_for_each_entry_reverse(ce, &pcd->clock_list, node)

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

		clk_disable(ce->clk);

		clk_disable(ce->clk);





	spin_unlock_irqrestore(&pcd->lock, flags);

	spin_unlock_irqrestore(&psd->lock, flags);





	return 0;

	return 0;

}

}
@@ -370,22 +376,22 @@ int pm_clk_suspend(struct device *dev) 
 */

 */

int pm_clk_resume(struct device *dev)

int pm_clk_resume(struct device *dev)

{

{

	struct pm_clk_data *pcd = __to_pcd(dev);

	struct pm_subsys_data *psd = dev_to_psd(dev);

	struct pm_clock_entry *ce;

	struct pm_clock_entry *ce;

	unsigned long flags;

	unsigned long flags;





	dev_dbg(dev, "%s()\n", __func__);

	dev_dbg(dev, "%s()\n", __func__);





	/* If there is no driver, the clocks should remain disabled. */

	/* If there is no driver, the clocks should remain disabled. */

	if (!pcd || !dev->driver)

	if (!psd || !dev->driver)

		return 0;

		return 0;





	spin_lock_irqsave(&pcd->lock, flags);

	spin_lock_irqsave(&psd->lock, flags);





	list_for_each_entry(ce, &pcd->clock_list, node)

	list_for_each_entry(ce, &psd->clock_list, node)

		clk_enable(ce->clk);

		clk_enable(ce->clk);





	spin_unlock_irqrestore(&pcd->lock, flags);

	spin_unlock_irqrestore(&psd->lock, flags);





	return 0;

	return 0;

}

}

include/linux/device.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -636,6 +636,11 @@ static inline void set_dev_node(struct device *dev, int node) 
}

}

#endif

#endif





static inline struct pm_subsys_data *dev_to_psd(struct device *dev)

{

	return dev ? dev->power.subsys_data : NULL;

}



static inline unsigned int dev_get_uevent_suppress(const struct device *dev)

static inline unsigned int dev_get_uevent_suppress(const struct device *dev)

{

{

	return dev->kobj.uevent_suppress;

	return dev->kobj.uevent_suppress;

include/linux/pm.h

+8 −1
Original line number Original line Diff line number Diff line
@@ -421,6 +421,13 @@ enum rpm_request { 




struct wakeup_source;

struct wakeup_source;





struct pm_subsys_data {

	spinlock_t lock;

#ifdef CONFIG_PM_CLK

	struct list_head clock_list;

#endif

};



struct dev_pm_info {

struct dev_pm_info {

	pm_message_t		power_state;

	pm_message_t		power_state;

	unsigned int		can_wakeup:1;

	unsigned int		can_wakeup:1;
@@ -462,7 +469,7 @@ struct dev_pm_info { 
	unsigned long		suspended_jiffies;

	unsigned long		suspended_jiffies;

	unsigned long		accounting_timestamp;

	unsigned long		accounting_timestamp;

#endif

#endif

	void			*subsys_data;  /* Owned by the subsystem. */

	struct pm_subsys_data	*subsys_data;  /* Owned by the subsystem. */

};

};





extern void update_pm_runtime_accounting(struct device *dev);

extern void update_pm_runtime_accounting(struct device *dev);

include/linux/pm_runtime.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -258,14 +258,18 @@ struct pm_clk_notifier_block { 
};

};





#ifdef CONFIG_PM_CLK

#ifdef CONFIG_PM_CLK

extern int pm_clk_init(struct device *dev);

extern void pm_clk_init(struct device *dev);

extern int pm_clk_create(struct device *dev);

extern void pm_clk_destroy(struct device *dev);

extern void pm_clk_destroy(struct device *dev);

extern int pm_clk_add(struct device *dev, const char *con_id);

extern int pm_clk_add(struct device *dev, const char *con_id);

extern void pm_clk_remove(struct device *dev, const char *con_id);

extern void pm_clk_remove(struct device *dev, const char *con_id);

extern int pm_clk_suspend(struct device *dev);

extern int pm_clk_suspend(struct device *dev);

extern int pm_clk_resume(struct device *dev);

extern int pm_clk_resume(struct device *dev);

#else

#else

static inline int pm_clk_init(struct device *dev)

static inline void pm_clk_init(struct device *dev)

{

}

static inline int pm_clk_create(struct device *dev)

{

{

	return -EINVAL;

	return -EINVAL;

}

}