Commit 2ddb8a39 authored by Perry Yuan's avatar Perry Yuan Committed by Rafael J. Wysocki
Browse files

cpufreq: amd-pstate: Bail out if min/max/nominal_freq is 0 



The amd-pstate driver cannot work when the min_freq, nominal_freq or
the max_freq is zero. When this happens it is prudent to error out
early on rather than waiting failing at the time of the governor
initialization.

Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarGautham R. Shenoy <gautham.shenoy@amd.com>
Tested-by: default avatarDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Signed-off-by: default avatarPerry Yuan <perry.yuan@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3cbbe887

drivers/cpufreq/amd-pstate.c

+10 −6
Original line number Diff line number Diff line
@@ -839,9 +839,11 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy) 
	nominal_freq = READ_ONCE(cpudata->nominal_freq);

	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);



	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {

		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",

			min_freq, max_freq);

	if (min_freq <= 0 || max_freq <= 0 ||

	    nominal_freq <= 0 || min_freq > max_freq) {

		dev_err(dev,

			"min_freq(%d) or max_freq(%d) or nominal_freq (%d) value is incorrect, check _CPC in ACPI tables\n",

			min_freq, max_freq, nominal_freq);

		ret = -EINVAL;

		goto free_cpudata1;

	}
@@ -1299,9 +1301,11 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) 
	max_freq = READ_ONCE(cpudata->max_freq);

	nominal_freq = READ_ONCE(cpudata->nominal_freq);

	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);

	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {

		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",

				min_freq, max_freq);

	if (min_freq <= 0 || max_freq <= 0 ||

	    nominal_freq <= 0 || min_freq > max_freq) {

		dev_err(dev,

			"min_freq(%d) or max_freq(%d) or nominal_freq(%d) value is incorrect, check _CPC in ACPI tables\n",

			min_freq, max_freq, nominal_freq);

		ret = -EINVAL;

		goto free_cpudata1;

	}