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

Commit 7c976664 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-opp' 

* pm-opp:
  PM / OPP: Return suspend_opp only if it is enabled
  PM / OPP: add dev_pm_opp_get_suspend_opp() helper
parents ae982073 1b2b90cb

drivers/base/power/opp.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -340,6 +340,34 @@ unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev) 
}

}

EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);

EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);





/**

 * dev_pm_opp_get_suspend_opp() - Get suspend opp

 * @dev:	device for which we do this operation

 *

 * Return: This function returns pointer to the suspend opp if it is

 * defined and available, otherwise it returns NULL.

 *

 * Locking: This function must be called under rcu_read_lock(). opp is a rcu

 * protected pointer. The reason for the same is that the opp pointer which is

 * returned will remain valid for use with opp_get_{voltage, freq} only while

 * under the locked area. The pointer returned must be used prior to unlocking

 * with rcu_read_unlock() to maintain the integrity of the pointer.

 */

struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)

{

	struct device_opp *dev_opp;



	opp_rcu_lockdep_assert();



	dev_opp = _find_device_opp(dev);

	if (IS_ERR(dev_opp) || !dev_opp->suspend_opp ||

	    !dev_opp->suspend_opp->available)

		return NULL;



	return dev_opp->suspend_opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);



/**

/**

 * dev_pm_opp_get_opp_count() - Get number of opps available in the opp list

 * dev_pm_opp_get_opp_count() - Get number of opps available in the opp list

 * @dev:	device for which we do this operation

 * @dev:	device for which we do this operation

include/linux/pm_opp.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp); 




int dev_pm_opp_get_opp_count(struct device *dev);

int dev_pm_opp_get_opp_count(struct device *dev);

unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev);

unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev);

struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev);





struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					      unsigned long freq,

					      unsigned long freq,
@@ -80,6 +81,11 @@ static inline unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev) 
	return 0;

	return 0;

}

}





static inline struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)

{

	return NULL;

}



static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					unsigned long freq, bool available)

					unsigned long freq, bool available)

{

{