Commit 992b9ff1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull operating performance points (OPP) changes for v5.12 from Viresh
Kumar:

"- Generic cleanups across the OPP core (Dmitry Osipenko, Viresh
   Kumar).

 - New OPP helpers dev_pm_opp_find_level_ceil(),
   dev_pm_opp_get_required_pstate(), dev_pm_opp_sync_regulators(),
   devm_pm_opp_register_set_opp_helper(),
   dev_pm_opp_of_add_table_noclk() and devm_pm_opp_attach_genpd()
   (Dmitry Osipenko, Viresh Kumar).

 - Allow required OPPs to be used for devfreq devices and related
   changes to devfreq governor (Saravana Kannan).

 - Significant code changes to allow a new OPP helper,
   dev_pm_opp_set_opp() (Viresh Kumar).

 - Remove dev_pm_opp_set_bw() and update related drivers (Viresh
   Kumar).

 - Allow lazy linking of required-OPPs (Viresh Kumar)."

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (37 commits)
  PM / devfreq: Add required OPPs support to passive governor
  PM / devfreq: Cache OPP table reference in devfreq
  OPP: Add function to look up required OPP's for a given OPP
  opp: Replace ENOTSUPP with EOPNOTSUPP
  opp: Fix "foo * bar" should be "foo *bar"
  opp: Don't ignore clk_get() errors other than -ENOENT
  opp: Update bandwidth requirements based on scaling up/down
  opp: Allow lazy-linking of required-opps
  opp: Remove dev_pm_opp_set_bw()
  devfreq: tegra30: Migrate to dev_pm_opp_set_opp()
  drm: msm: Migrate to dev_pm_opp_set_opp()
  cpufreq: qcom: Migrate to dev_pm_opp_set_opp()
  opp: Implement dev_pm_opp_set_opp()
  opp: Update parameters of  _set_opp_custom()
  opp: Allow _generic_set_opp_clk_only() to work for non-freq devices
  opp: Allow _generic_set_opp_regulator() to work for non-freq devices
  opp: Allow _set_opp() to work for non-freq devices
  opp: Split _set_opp() out of dev_pm_opp_set_rate()
  opp: Keep track of currently programmed OPP
  opp: No need to check clk for errors
  ...
parents 1048ba83 86ad9a24

drivers/cpufreq/qcom-cpufreq-hw.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int qcom_cpufreq_set_bw(struct cpufreq_policy *policy, 
	if (IS_ERR(opp))

		return PTR_ERR(opp);



	ret = dev_pm_opp_set_bw(dev, opp);

	ret = dev_pm_opp_set_opp(dev, opp);

	dev_pm_opp_put(opp);

	return ret;

}

drivers/devfreq/devfreq.c

+7 −0
Original line number Diff line number Diff line
@@ -757,6 +757,9 @@ static void devfreq_dev_release(struct device *dev) 
	if (devfreq->profile->exit)

		devfreq->profile->exit(devfreq->dev.parent);



	if (devfreq->opp_table)

		dev_pm_opp_put_opp_table(devfreq->opp_table);



	mutex_destroy(&devfreq->lock);

	kfree(devfreq);

}
@@ -844,6 +847,10 @@ struct devfreq *devfreq_add_device(struct device *dev, 
	}



	devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);

	devfreq->opp_table = dev_pm_opp_get_opp_table(dev);

	if (IS_ERR(devfreq->opp_table))

		devfreq->opp_table = NULL;



	atomic_set(&devfreq->suspend_count, 0);



	dev_set_name(&devfreq->dev, "%s", dev_name(dev));

drivers/devfreq/governor_passive.c

+25 −19
Original line number Diff line number Diff line
@@ -19,18 +19,16 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq, 
			= (struct devfreq_passive_data *)devfreq->data;

	struct devfreq *parent_devfreq = (struct devfreq *)p_data->parent;

	unsigned long child_freq = ULONG_MAX;

	struct dev_pm_opp *opp;

	int i, count, ret = 0;

	struct dev_pm_opp *opp, *p_opp;

	int i, count;



	/*

	 * If the devfreq device with passive governor has the specific method

	 * to determine the next frequency, should use the get_target_freq()

	 * of struct devfreq_passive_data.

	 */

	if (p_data->get_target_freq) {

		ret = p_data->get_target_freq(devfreq, freq);

		goto out;

	}

	if (p_data->get_target_freq)

		return p_data->get_target_freq(devfreq, freq);



	/*

	 * If the parent and passive devfreq device uses the OPP table,
@@ -56,26 +54,35 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq, 
	 * list of parent device. Because in this case, *freq is temporary

	 * value which is decided by ondemand governor.

	 */

	opp = devfreq_recommended_opp(parent_devfreq->dev.parent, freq, 0);

	if (IS_ERR(opp)) {

		ret = PTR_ERR(opp);

		goto out;

	}

	if (devfreq->opp_table && parent_devfreq->opp_table) {

		p_opp = devfreq_recommended_opp(parent_devfreq->dev.parent,

						freq, 0);

		if (IS_ERR(p_opp))

			return PTR_ERR(p_opp);



		opp = dev_pm_opp_xlate_required_opp(parent_devfreq->opp_table,

						    devfreq->opp_table, p_opp);

		dev_pm_opp_put(p_opp);



		if (IS_ERR(opp))

			return PTR_ERR(opp);



		*freq = dev_pm_opp_get_freq(opp);

		dev_pm_opp_put(opp);



		return 0;

	}



	/*

	 * Get the OPP table's index of decided freqeuncy by governor

	 * Get the OPP table's index of decided frequency by governor

	 * of parent device.

	 */

	for (i = 0; i < parent_devfreq->profile->max_state; i++)

		if (parent_devfreq->profile->freq_table[i] == *freq)

			break;



	if (i == parent_devfreq->profile->max_state) {

		ret = -EINVAL;

		goto out;

	}

	if (i == parent_devfreq->profile->max_state)

		return -EINVAL;



	/* Get the suitable frequency by using index of parent device. */

	if (i < devfreq->profile->max_state) {
@@ -88,8 +95,7 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq, 
	/* Return the suitable frequency for passive device. */

	*freq = child_freq;



out:

	return ret;

	return 0;

}



static int devfreq_passive_notifier_call(struct notifier_block *nb,

drivers/devfreq/tegra30-devfreq.c

+2 −2
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int tegra_devfreq_target(struct device *dev, unsigned long *freq, 
		return PTR_ERR(opp);

	}



	ret = dev_pm_opp_set_bw(dev, opp);

	ret = dev_pm_opp_set_opp(dev, opp);

	dev_pm_opp_put(opp);



	return ret;
@@ -849,7 +849,7 @@ static int tegra_devfreq_probe(struct platform_device *pdev) 
		return err;

	}



	err = dev_pm_opp_of_add_table(&pdev->dev);

	err = dev_pm_opp_of_add_table_noclk(&pdev->dev, 0);

	if (err) {

		dev_err(&pdev->dev, "Failed to add OPP table: %d\n", err);

		goto put_hw;

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+4 −4
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp) 


	if (!gmu->legacy) {

		a6xx_hfi_set_freq(gmu, perf_index);

		dev_pm_opp_set_bw(&gpu->pdev->dev, opp);

		dev_pm_opp_set_opp(&gpu->pdev->dev, opp);

		pm_runtime_put(gmu->dev);

		return;

	}
@@ -158,7 +158,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp) 
	if (ret)

		dev_err(gmu->dev, "GMU set GPU frequency error: %d\n", ret);



	dev_pm_opp_set_bw(&gpu->pdev->dev, opp);

	dev_pm_opp_set_opp(&gpu->pdev->dev, opp);

	pm_runtime_put(gmu->dev);

}
@@ -866,7 +866,7 @@ static void a6xx_gmu_set_initial_bw(struct msm_gpu *gpu, struct a6xx_gmu *gmu) 
	if (IS_ERR_OR_NULL(gpu_opp))

		return;



	dev_pm_opp_set_bw(&gpu->pdev->dev, gpu_opp);

	dev_pm_opp_set_opp(&gpu->pdev->dev, gpu_opp);

	dev_pm_opp_put(gpu_opp);

}
@@ -1072,7 +1072,7 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) 
		a6xx_gmu_shutdown(gmu);



	/* Remove the bus vote */

	dev_pm_opp_set_bw(&gpu->pdev->dev, NULL);

	dev_pm_opp_set_opp(&gpu->pdev->dev, NULL);



	/*

	 * Make sure the GX domain is off before turning off the GMU (CX)