Commit 3c543b42 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Migrate set-opp-helper API to use set-config helpers 



Now that we have a central API to handle all OPP table configurations,
migrate the set-opp-helper family of helpers to use the new
infrastructure.

The return type and parameter to the APIs change a bit due to this,
update the current users as well in the same commit in order to avoid
breaking builds.

Remove devm_pm_opp_register_set_opp_helper() as it has no users
currently.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 2368f576

drivers/opp/core.c

+20 −69
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ static void _opp_put_clknames(struct opp_table *opp_table) 
}



/**

 * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper

 * _opp_register_set_opp_helper() - Register custom set OPP helper

 * @dev: Device for which the helper is getting registered.

 * @set_opp: Custom set OPP helper.

 *
@@ -2240,32 +2240,18 @@ static void _opp_put_clknames(struct opp_table *opp_table) 
 *

 * This must be called before any OPPs are initialized for the device.

 */

struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev,

			int (*set_opp)(struct dev_pm_set_opp_data *data))

static int _opp_register_set_opp_helper(struct opp_table *opp_table,

	struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data))

{

	struct dev_pm_set_opp_data *data;

	struct opp_table *opp_table;



	if (!set_opp)

		return ERR_PTR(-EINVAL);



	opp_table = _add_opp_table(dev, false);

	if (IS_ERR(opp_table))

		return opp_table;



	/* This should be called before OPPs are initialized */

	if (WARN_ON(!list_empty(&opp_table->opp_list))) {

		dev_pm_opp_put_opp_table(opp_table);

		return ERR_PTR(-EBUSY);

	}



	/* Another CPU that shares the OPP table has set the helper ? */

	if (opp_table->set_opp)

		return opp_table;

		return 0;



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

	if (!data)

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;



	mutex_lock(&opp_table->lock);

	opp_table->set_opp_data = data;
@@ -2278,61 +2264,27 @@ struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, 


	opp_table->set_opp = set_opp;



	return opp_table;

	return 0;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_register_set_opp_helper);



/**

 * dev_pm_opp_unregister_set_opp_helper() - Releases resources blocked for

 *					   set_opp helper

 * @opp_table: OPP table returned from dev_pm_opp_register_set_opp_helper().

 * _opp_unregister_set_opp_helper() - Releases resources blocked for set_opp helper

 * @opp_table: OPP table returned from _opp_register_set_opp_helper().

 *

 * Release resources blocked for platform specific set_opp helper.

 */

void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table)

static void _opp_unregister_set_opp_helper(struct opp_table *opp_table)

{

	if (unlikely(!opp_table))

		return;



	if (opp_table->set_opp) {

		opp_table->set_opp = NULL;



		mutex_lock(&opp_table->lock);

		kfree(opp_table->set_opp_data);

		opp_table->set_opp_data = NULL;

		mutex_unlock(&opp_table->lock);



	dev_pm_opp_put_opp_table(opp_table);

	}

EXPORT_SYMBOL_GPL(dev_pm_opp_unregister_set_opp_helper);



static void devm_pm_opp_unregister_set_opp_helper(void *data)

{

	dev_pm_opp_unregister_set_opp_helper(data);

}



/**

 * devm_pm_opp_register_set_opp_helper() - Register custom set OPP helper

 * @dev: Device for which the helper is getting registered.

 * @set_opp: Custom set OPP helper.

 *

 * This is a resource-managed version of dev_pm_opp_register_set_opp_helper().

 *

 * Return: 0 on success and errorno otherwise.

 */

int devm_pm_opp_register_set_opp_helper(struct device *dev,

					int (*set_opp)(struct dev_pm_set_opp_data *data))

{

	struct opp_table *opp_table;



	opp_table = dev_pm_opp_register_set_opp_helper(dev, set_opp);

	if (IS_ERR(opp_table))

		return PTR_ERR(opp_table);



	return devm_add_action_or_reset(dev, devm_pm_opp_unregister_set_opp_helper,

					opp_table);

}

EXPORT_SYMBOL_GPL(devm_pm_opp_register_set_opp_helper);



static void _opp_detach_genpd(struct opp_table *opp_table)

{

	int index;
@@ -2507,7 +2459,7 @@ static void _opp_clear_config(struct opp_config_data *data) 
	if (data->flags & OPP_CONFIG_SUPPORTED_HW)

		_opp_put_supported_hw(data->opp_table);

	if (data->flags & OPP_CONFIG_REGULATOR_HELPER)

		dev_pm_opp_unregister_set_opp_helper(data->opp_table);

		_opp_unregister_set_opp_helper(data->opp_table);

	if (data->flags & OPP_CONFIG_PROP_NAME)

		dev_pm_opp_put_prop_name(data->opp_table);

	if (data->flags & OPP_CONFIG_CLK)
@@ -2582,11 +2534,10 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config) 


	/* Configure opp helper */

	if (config->set_opp) {

		err = dev_pm_opp_register_set_opp_helper(dev, config->set_opp);

		if (IS_ERR(err)) {

			ret = PTR_ERR(err);

		ret = _opp_register_set_opp_helper(opp_table, dev,

						   config->set_opp);

		if (ret)

			goto err;

		}



		data->flags |= OPP_CONFIG_REGULATOR_HELPER;

	}

drivers/opp/ti-opp-supply.c

+3 −3
Original line number Diff line number Diff line
@@ -405,9 +405,9 @@ static int ti_opp_supply_probe(struct platform_device *pdev) 
			return ret;

	}



	ret = PTR_ERR_OR_ZERO(dev_pm_opp_register_set_opp_helper(cpu_dev,

								 ti_opp_supply_set_opp));

	if (ret)

	ret = dev_pm_opp_register_set_opp_helper(cpu_dev,

						 ti_opp_supply_set_opp);

	if (ret < 0)

		_free_optimized_voltages(dev, &opp_data);



	return ret;

include/linux/pm_opp.h

+16 −17
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ void dev_pm_opp_clear_config(int token); 


struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name);

void dev_pm_opp_put_prop_name(struct opp_table *opp_table);

struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data));

void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table);

int devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data));

struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs);

void dev_pm_opp_detach_genpd(struct opp_table *opp_table);

int devm_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs);
@@ -363,20 +360,6 @@ static inline int dev_pm_opp_unregister_notifier(struct device *dev, struct noti 
	return -EOPNOTSUPP;

}



static inline struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev,

			int (*set_opp)(struct dev_pm_set_opp_data *data))

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table) {}



static inline int devm_pm_opp_register_set_opp_helper(struct device *dev,

				    int (*set_opp)(struct dev_pm_set_opp_data *data))

{

	return -EOPNOTSUPP;

}



static inline struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name)

{

	return ERR_PTR(-EOPNOTSUPP);
@@ -640,4 +623,20 @@ static inline int devm_pm_opp_set_clkname(struct device *dev, const char *name) 
	return devm_pm_opp_set_config(dev, &config);

}



/* set-opp helpers */

static inline int dev_pm_opp_register_set_opp_helper(struct device *dev,

			int (*set_opp)(struct dev_pm_set_opp_data *data))

{

	struct dev_pm_opp_config config = {

		.set_opp = set_opp,

	};



	return dev_pm_opp_set_config(dev, &config);

}



static inline void dev_pm_opp_unregister_set_opp_helper(int token)

{

	dev_pm_opp_clear_config(token);

}



#endif		/* __LINUX_OPP_H__ */