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

Commit 2fa5f6f0 authored by Saravana Kannan's avatar Saravana Kannan Committed by Amir Vajid
Browse files

PM / devfreq: governor_bw_hwmon: Add suspend/resume support 



Some devfreq devices using this governor might need suspend/resume support.
When suspended, those devices won't need any bandwidth votes and there is
no point in monitoring their bandwidth either.

Therefore, upon suspend, vote for zero bandwidth and stop the HW monitor.
Upon resume, vote for the previous bandwidth and start the HW monitor.

Change-Id: I318449995d714959f0ebfe91961bc23fa8edbd04
Signed-off-by: default avatarSaravana Kannan <skannan@codeaurora.org>
[avajid@codeaurora.org: resolved trival merge conflicts and made minor styling changes]
Signed-off-by: default avatarAmir Vajid <avajid@codeaurora.org>
parent 716a0283

drivers/devfreq/bimc-bwmon.c

+26 −0
Original line number Diff line number Diff line
@@ -240,6 +240,30 @@ static void stop_bw_hwmon(struct bw_hwmon *hw) 
	mon_irq_clear(m);

}



static int suspend_bw_hwmon(struct bw_hwmon *hw)

{

	struct bwmon *m = to_bwmon(hw);



	disable_irq(m->irq);

	mon_disable(m);

	mon_irq_disable(m);

	mon_irq_clear(m);



	return 0;

}



static int resume_bw_hwmon(struct bw_hwmon *hw)

{

	struct bwmon *m = to_bwmon(hw);



	mon_clear(m);

	mon_irq_enable(m);

	mon_enable(m);

	enable_irq(m->irq);



	return 0;

}



/*************************************************************************/



static int bimc_bwmon_driver_probe(struct platform_device *pdev)
@@ -295,6 +319,8 @@ static int bimc_bwmon_driver_probe(struct platform_device *pdev) 
		return -EINVAL;

	m->hw.start_hwmon = &start_bw_hwmon;

	m->hw.stop_hwmon = &stop_bw_hwmon;

	m->hw.suspend_hwmon = &suspend_bw_hwmon;

	m->hw.resume_hwmon = &resume_bw_hwmon;

	m->hw.meas_bw_and_set_irq = &meas_bw_and_set_irq;



	ret = register_bw_hwmon(dev, &m->hw);

drivers/devfreq/governor_bw_hwmon.c

+140 −21
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ struct hwmon_node { 
	unsigned int		bw_step;

	unsigned long		prev_ab;

	unsigned long		*dev_ab;

	unsigned long		resume_freq;

	unsigned long		resume_ab;

	ktime_t			prev_ts;

	bool			mon_started;

	struct list_head	list;
@@ -206,10 +208,61 @@ int update_bw_hwmon(struct bw_hwmon *hwmon) 
	return 0;

}



static int start_monitoring(struct devfreq *df)

static int start_monitor(struct devfreq *df, bool init)

{

	int ret = 0;

	struct hwmon_node *node = df->data;

	struct bw_hwmon *hw = node->hw;

	struct device *dev = df->dev.parent;

	unsigned long mbps;

	int ret;



	node->prev_ts = ktime_get();



	if (init) {

		node->prev_ab = 0;

		node->resume_freq = 0;

		node->resume_ab = 0;

		mbps = (df->previous_freq * node->io_percent) / 100;

		ret = hw->start_hwmon(hw, mbps);

	} else {

		ret = hw->resume_hwmon(hw);

	}



	if (ret < 0) {

		dev_err(dev, "Unable to start HW monitor! (%d)\n", ret);

		return ret;

	}



	if (init)

		devfreq_monitor_start(df);

	else

		devfreq_monitor_resume(df);



	node->mon_started = true;



	return 0;

}



static void stop_monitor(struct devfreq *df, bool init)

{

	struct hwmon_node *node = df->data;

	struct bw_hwmon *hw = node->hw;



	node->mon_started = false;



	if (init) {

		devfreq_monitor_stop(df);

		hw->stop_hwmon(hw);

	} else {

		devfreq_monitor_suspend(df);

		hw->suspend_hwmon(hw);

	}



}



static int gov_start(struct devfreq *df)

{

	int ret = 0;

	struct device *dev = df->dev.parent;

	struct hwmon_node *node;

	struct bw_hwmon *hw;
@@ -234,17 +287,8 @@ static int start_monitoring(struct devfreq *df) 
	node->orig_data = df->data;

	df->data = node;



	node->prev_ts = ktime_get();

	node->prev_ab = 0;

	mbps = (df->previous_freq * node->io_percent) / 100;

	ret = hw->start_hwmon(hw, mbps);

	if (ret < 0) {

		dev_err(dev, "Unable to start HW monitor! (%d)\n", ret);

	if (start_monitor(df, true))

		goto err_start;

	}



	devfreq_monitor_start(df);

	node->mon_started = true;



	ret = sysfs_create_group(&df->dev.kobj, node->attr_grp);

	if (ret < 0) {
@@ -255,9 +299,7 @@ static int start_monitoring(struct devfreq *df) 
	return 0;



err_sysfs:

	node->mon_started = false;

	devfreq_monitor_stop(df);

	hw->stop_hwmon(hw);

	stop_monitor(df, true);

err_start:

	df->data = node->orig_data;

	node->orig_data = NULL;
@@ -266,15 +308,13 @@ static int start_monitoring(struct devfreq *df) 
	return ret;

}



static void stop_monitoring(struct devfreq *df)

static void gov_stop(struct devfreq *df)

{

	struct hwmon_node *node = df->data;

	struct bw_hwmon *hw = node->hw;



	sysfs_remove_group(&df->dev.kobj, node->attr_grp);

	node->mon_started = false;

	devfreq_monitor_stop(df);

	hw->stop_hwmon(hw);

	stop_monitor(df, true);

	df->data = node->orig_data;

	node->orig_data = NULL;

	hw->df = NULL;
@@ -289,12 +329,67 @@ static void stop_monitoring(struct devfreq *df) 
	node->dev_ab = NULL;

}



static int gov_suspend(struct devfreq *df)

{

	struct hwmon_node *node = df->data;

	unsigned long resume_freq = df->previous_freq;

	unsigned long resume_ab = *node->dev_ab;



	if (!node->hw->suspend_hwmon)

		return -EPERM;



	if (node->resume_freq) {

		dev_warn(df->dev.parent, "Governor already suspended!\n");

		return -EBUSY;

	}



	stop_monitor(df, false);



	mutex_lock(&df->lock);

	update_devfreq(df);

	mutex_unlock(&df->lock);



	node->resume_freq = resume_freq;

	node->resume_ab = resume_ab;



	return 0;

}



static int gov_resume(struct devfreq *df)

{

	struct hwmon_node *node = df->data;



	if (!node->hw->resume_hwmon)

		return -EPERM;



	if (!node->resume_freq) {

		dev_warn(df->dev.parent, "Governor already resumed!\n");

		return -EBUSY;

	}



	mutex_lock(&df->lock);

	update_devfreq(df);

	mutex_unlock(&df->lock);



	node->resume_freq = 0;

	node->resume_ab = 0;



	return start_monitor(df, false);

}



static int devfreq_bw_hwmon_get_freq(struct devfreq *df,

					unsigned long *freq)

{

	unsigned long mbps;

	struct hwmon_node *node = df->data;



	/* Suspend/resume sequence */

	if (!node->mon_started) {

		*freq = node->resume_freq;

		*node->dev_ab = node->resume_ab;

		return 0;

	}



	mbps = measure_bw_and_set_irq(node);

	compute_bw(node, mbps, freq, node->dev_ab);
@@ -344,7 +439,7 @@ static int devfreq_bw_hwmon_ev_handler(struct devfreq *df, 
		sample_ms = min(MAX_MS, sample_ms);

		df->profile->polling_ms = sample_ms;



		ret = start_monitoring(df);

		ret = gov_start(df);

		if (ret < 0)

			return ret;
@@ -352,7 +447,7 @@ static int devfreq_bw_hwmon_ev_handler(struct devfreq *df, 
			"Enabled dev BW HW monitor governor\n");

		break;

	case DEVFREQ_GOV_STOP:

		stop_monitoring(df);

		gov_stop(df);

		dev_dbg(df->dev.parent,

			"Disabled dev BW HW monitor governor\n");

		break;
@@ -362,6 +457,30 @@ static int devfreq_bw_hwmon_ev_handler(struct devfreq *df, 
		sample_ms = min(MAX_MS, sample_ms);

		devfreq_interval_update(df, &sample_ms);

		break;



	case DEVFREQ_GOV_SUSPEND:

		ret = gov_suspend(df);

		if (ret < 0) {

			dev_err(df->dev.parent,

				"Unable to suspend BW HW mon governor (%d)\n",

				ret);

			return ret;

		}



		dev_dbg(df->dev.parent, "Suspended BW HW mon governor\n");

		break;



	case DEVFREQ_GOV_RESUME:

		ret = gov_resume(df);

		if (ret < 0) {

			dev_err(df->dev.parent,

				"Unable to resume BW HW mon governor (%d)\n",

				ret);

			return ret;

		}



		dev_dbg(df->dev.parent, "Resumed BW HW mon governor\n");

		break;

	}



	return 0;

drivers/devfreq/governor_bw_hwmon.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ struct bw_hwmon { 
	int			(*start_hwmon)(struct bw_hwmon *hw,

					unsigned long mbps);

	void			(*stop_hwmon)(struct bw_hwmon *hw);

	int			(*suspend_hwmon)(struct bw_hwmon *hw);

	int			(*resume_hwmon)(struct bw_hwmon *hw);

	unsigned long		(*meas_bw_and_set_irq)(struct bw_hwmon *hw,

					unsigned int tol, unsigned int us);

	struct device		*dev;