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

Merge branches 'pm-opp' and 'pm-cpufreq' 

Merge operating performance points (OPP) framework updates for and
intel_pstate driver fixes for 5.16-rc1.

* pm-opp:
  dt-bindings: opp: Allow multi-worded OPP entry name
  opp: Fix return in _opp_add_static_v2()
  PM / devfreq: tegra30: Check whether clk_round_rate() returns zero rate
  PM / devfreq: tegra30: Use resource-managed helpers
  PM / devfreq: Add devm_devfreq_add_governor()
  opp: Add more resource-managed variants of dev_pm_opp_of_add_table()
  opp: Change type of dev_pm_opp_attach_genpd(names) argument
  opp: Fix required-opps phandle array count check

* pm-cpufreq:
  cpufreq: intel_pstate: Clear HWP Status during HWP Interrupt enable
  cpufreq: intel_pstate: Fix unchecked MSR 0x773 access
  cpufreq: intel_pstate: Clear HWP desired on suspend/shutdown and offline
parents 2aa36604 5c83017c 074d0cdf

Documentation/devicetree/bindings/opp/opp-v2-base.yaml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ properties: 
    type: boolean



patternProperties:

  '^opp-?[0-9]+$':

  '^opp(-?[0-9]+)*$':

    type: object

    description:

      One or more OPP nodes describing voltage-current-frequency combinations.

drivers/cpufreq/intel_pstate.c

+34 −2
Original line number Diff line number Diff line
@@ -1006,9 +1006,16 @@ static void intel_pstate_hwp_offline(struct cpudata *cpu) 
		 */

		value &= ~GENMASK_ULL(31, 24);

		value |= HWP_ENERGY_PERF_PREFERENCE(cpu->epp_cached);

		WRITE_ONCE(cpu->hwp_req_cached, value);

	}



	/*

	 * Clear the desired perf field in the cached HWP request value to

	 * prevent nonzero desired values from being leaked into the active

	 * mode.

	 */

	value &= ~HWP_DESIRED_PERF(~0L);

	WRITE_ONCE(cpu->hwp_req_cached, value);



	value &= ~GENMASK_ULL(31, 0);

	min_perf = HWP_LOWEST_PERF(READ_ONCE(cpu->hwp_cap_cached));
@@ -1620,6 +1627,9 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata) 
{

	unsigned long flags;



	if (!boot_cpu_has(X86_FEATURE_HWP_NOTIFY))

		return;



	/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */

	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
@@ -1642,6 +1652,7 @@ static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata) 


		/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */

		wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x01);

		wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_STATUS, 0);

	}

}
@@ -3003,6 +3014,27 @@ static int intel_cpufreq_cpu_exit(struct cpufreq_policy *policy) 
	return intel_pstate_cpu_exit(policy);

}



static int intel_cpufreq_suspend(struct cpufreq_policy *policy)

{

	intel_pstate_suspend(policy);



	if (hwp_active) {

		struct cpudata *cpu = all_cpu_data[policy->cpu];

		u64 value = READ_ONCE(cpu->hwp_req_cached);



		/*

		 * Clear the desired perf field in MSR_HWP_REQUEST in case

		 * intel_cpufreq_adjust_perf() is in use and the last value

		 * written by it may not be suitable.

		 */

		value &= ~HWP_DESIRED_PERF(~0L);

		wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value);

		WRITE_ONCE(cpu->hwp_req_cached, value);

	}



	return 0;

}



static struct cpufreq_driver intel_cpufreq = {

	.flags		= CPUFREQ_CONST_LOOPS,

	.verify		= intel_cpufreq_verify_policy,
@@ -3012,7 +3044,7 @@ static struct cpufreq_driver intel_cpufreq = { 
	.exit		= intel_cpufreq_cpu_exit,

	.offline	= intel_cpufreq_cpu_offline,

	.online		= intel_pstate_cpu_online,

	.suspend	= intel_pstate_suspend,

	.suspend	= intel_cpufreq_suspend,

	.resume		= intel_pstate_resume,

	.update_limits	= intel_pstate_update_limits,

	.name		= "intel_cpufreq",

drivers/devfreq/devfreq.c

+26 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,32 @@ int devfreq_add_governor(struct devfreq_governor *governor) 
}

EXPORT_SYMBOL(devfreq_add_governor);



static void devm_devfreq_remove_governor(void *governor)

{

	WARN_ON(devfreq_remove_governor(governor));

}



/**

 * devm_devfreq_add_governor() - Add devfreq governor

 * @dev:	device which adds devfreq governor

 * @governor:	the devfreq governor to be added

 *

 * This is a resource-managed variant of devfreq_add_governor().

 */

int devm_devfreq_add_governor(struct device *dev,

			      struct devfreq_governor *governor)

{

	int err;



	err = devfreq_add_governor(governor);

	if (err)

		return err;



	return devm_add_action_or_reset(dev, devm_devfreq_remove_governor,

					governor);

}

EXPORT_SYMBOL(devm_devfreq_add_governor);



/**

 * devfreq_remove_governor() - Remove devfreq feature from a device.

 * @governor:	the devfreq governor to be removed

drivers/devfreq/governor.h

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ void devfreq_update_interval(struct devfreq *devfreq, unsigned int *delay); 
int devfreq_add_governor(struct devfreq_governor *governor);

int devfreq_remove_governor(struct devfreq_governor *governor);



int devm_devfreq_add_governor(struct device *dev,

			      struct devfreq_governor *governor);



int devfreq_update_status(struct devfreq *devfreq, unsigned long freq);

int devfreq_update_target(struct devfreq *devfreq, unsigned long freq);

drivers/devfreq/tegra30-devfreq.c

+47 −62
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ struct tegra_devfreq_soc_data { 


struct tegra_devfreq {

	struct devfreq		*devfreq;

	struct opp_table	*opp_table;



	struct reset_control	*reset;

	struct clk		*clock;
@@ -789,6 +788,39 @@ static struct devfreq_governor tegra_devfreq_governor = { 
	.event_handler = tegra_governor_event_handler,

};



static void devm_tegra_devfreq_deinit_hw(void *data)

{

	struct tegra_devfreq *tegra = data;



	reset_control_reset(tegra->reset);

	clk_disable_unprepare(tegra->clock);

}



static int devm_tegra_devfreq_init_hw(struct device *dev,

				      struct tegra_devfreq *tegra)

{

	int err;



	err = clk_prepare_enable(tegra->clock);

	if (err) {

		dev_err(dev, "Failed to prepare and enable ACTMON clock\n");

		return err;

	}



	err = devm_add_action_or_reset(dev, devm_tegra_devfreq_deinit_hw,

				       tegra);

	if (err)

		return err;



	err = reset_control_reset(tegra->reset);

	if (err) {

		dev_err(dev, "Failed to reset hardware: %d\n", err);

		return err;

	}



	return err;

}



static int tegra_devfreq_probe(struct platform_device *pdev)

{

	u32 hw_version = BIT(tegra_sku_info.soc_speedo_id);
@@ -842,38 +874,26 @@ static int tegra_devfreq_probe(struct platform_device *pdev) 
		return err;

	}



	tegra->opp_table = dev_pm_opp_set_supported_hw(&pdev->dev,

						       &hw_version, 1);

	err = PTR_ERR_OR_ZERO(tegra->opp_table);

	err = devm_pm_opp_set_supported_hw(&pdev->dev, &hw_version, 1);

	if (err) {

		dev_err(&pdev->dev, "Failed to set supported HW: %d\n", err);

		return err;

	}



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

	err = devm_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;

	}



	err = clk_prepare_enable(tegra->clock);

	if (err) {

		dev_err(&pdev->dev,

			"Failed to prepare and enable ACTMON clock\n");

		goto remove_table;

		return err;

	}



	err = reset_control_reset(tegra->reset);

	if (err) {

		dev_err(&pdev->dev, "Failed to reset hardware: %d\n", err);

		goto disable_clk;

	}

	err = devm_tegra_devfreq_init_hw(&pdev->dev, tegra);

	if (err)

		return err;



	rate = clk_round_rate(tegra->emc_clock, ULONG_MAX);

	if (rate < 0) {

	if (rate <= 0) {

		dev_err(&pdev->dev, "Failed to round clock rate: %ld\n", rate);

		err = rate;

		goto disable_clk;

		return rate ?: -EINVAL;

	}



	tegra->max_freq = rate / KHZ;
@@ -892,52 +912,18 @@ static int tegra_devfreq_probe(struct platform_device *pdev) 
	INIT_DELAYED_WORK(&tegra->cpufreq_update_work,

			  tegra_actmon_delayed_update);



	err = devfreq_add_governor(&tegra_devfreq_governor);

	err = devm_devfreq_add_governor(&pdev->dev, &tegra_devfreq_governor);

	if (err) {

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

		goto remove_opps;

		return err;

	}



	tegra_devfreq_profile.initial_freq = clk_get_rate(tegra->emc_clock);



	devfreq = devfreq_add_device(&pdev->dev, &tegra_devfreq_profile,

	devfreq = devm_devfreq_add_device(&pdev->dev, &tegra_devfreq_profile,

					  "tegra_actmon", NULL);

	if (IS_ERR(devfreq)) {

		err = PTR_ERR(devfreq);

		goto remove_governor;

	}



	return 0;



remove_governor:

	devfreq_remove_governor(&tegra_devfreq_governor);



remove_opps:

	dev_pm_opp_remove_all_dynamic(&pdev->dev);



	reset_control_reset(tegra->reset);

disable_clk:

	clk_disable_unprepare(tegra->clock);

remove_table:

	dev_pm_opp_of_remove_table(&pdev->dev);

put_hw:

	dev_pm_opp_put_supported_hw(tegra->opp_table);



	return err;

}



static int tegra_devfreq_remove(struct platform_device *pdev)

{

	struct tegra_devfreq *tegra = platform_get_drvdata(pdev);



	devfreq_remove_device(tegra->devfreq);

	devfreq_remove_governor(&tegra_devfreq_governor);



	reset_control_reset(tegra->reset);

	clk_disable_unprepare(tegra->clock);



	dev_pm_opp_of_remove_table(&pdev->dev);

	dev_pm_opp_put_supported_hw(tegra->opp_table);

	if (IS_ERR(devfreq))

		return PTR_ERR(devfreq);



	return 0;

}
@@ -967,7 +953,6 @@ MODULE_DEVICE_TABLE(of, tegra_devfreq_of_match); 


static struct platform_driver tegra_devfreq_driver = {

	.probe	= tegra_devfreq_probe,

	.remove	= tegra_devfreq_remove,

	.driver = {

		.name = "tegra-devfreq",

		.of_match_table = tegra_devfreq_of_match,