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

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

Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools' 

* pm-cpufreq:
  cpufreq: speedstep-smi: enable interrupts when waiting

* pm-cpuidle:
  intel_idle: support additional Broadwell model

* pm-devfreq:
  PM / devfreq: event: testing the wrong variable

* pm-opp:
  PM / OPP / clk: Remove unnecessary OOM message

* pm-tools:
  tools/power turbostat: support additional Broadwell model
  tools/power turbostat: update parameters, documentation
  tools/power turbostat: Skip printing disabled package C-states
parents 69bf75e9 d4d4eda2 5177a94a 04a695ed 59d84ca8 79b56ab8

drivers/base/firmware_class.c

+0 −1
Original line number Diff line number Diff line
@@ -855,7 +855,6 @@ fw_create_instance(struct firmware *firmware, const char *fw_name, 


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

	if (!fw_priv) {

		dev_err(device, "%s: kmalloc failed\n", __func__);

		fw_priv = ERR_PTR(-ENOMEM);

		goto exit;

	}

drivers/base/power/clock_ops.c

+1 −3
Original line number Diff line number Diff line
@@ -81,10 +81,8 @@ static int __pm_clk_add(struct device *dev, const char *con_id, 
		return -EINVAL;



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

	if (!ce) {

		dev_err(dev, "Not enough memory for clock entry.\n");

	if (!ce)

		return -ENOMEM;

	}



	if (con_id) {

		ce->con_id = kstrdup(con_id, GFP_KERNEL);

drivers/base/power/opp.c

+2 −6
Original line number Diff line number Diff line
@@ -474,10 +474,8 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, 


	/* allocate new OPP node */

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

	if (!new_opp) {

		dev_warn(dev, "%s: Unable to create new OPP node\n", __func__);

	if (!new_opp)

		return -ENOMEM;

	}



	/* Hold our list modification lock here */

	mutex_lock(&dev_opp_list_lock);
@@ -695,10 +693,8 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, 


	/* keep the node allocated */

	new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);

	if (!new_opp) {

		dev_warn(dev, "%s: Unable to create OPP\n", __func__);

	if (!new_opp)

		return -ENOMEM;

	}



	mutex_lock(&dev_opp_list_lock);

drivers/cpufreq/speedstep-lib.c

+3 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor, 


	pr_debug("previous speed is %u\n", prev_speed);



	preempt_disable();

	local_irq_save(flags);



	/* switch to low state */
@@ -464,6 +465,8 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor, 


out:

	local_irq_restore(flags);

	preempt_enable();



	return ret;

}

EXPORT_SYMBOL_GPL(speedstep_get_freqs);

drivers/cpufreq/speedstep-smi.c

+12 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static void speedstep_set_state(unsigned int state) 
		return;



	/* Disable IRQs */

	preempt_disable();

	local_irq_save(flags);



	command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
@@ -166,9 +167,19 @@ static void speedstep_set_state(unsigned int state) 


	do {

		if (retry) {

			/*

			 * We need to enable interrupts, otherwise the blockage

			 * won't resolve.

			 *

			 * We disable preemption so that other processes don't

			 * run. If other processes were running, they could

			 * submit more DMA requests, making the blockage worse.

			 */

			pr_debug("retry %u, previous result %u, waiting...\n",

					retry, result);

			local_irq_enable();

			mdelay(retry * 50);

			local_irq_disable();

		}

		retry++;

		__asm__ __volatile__(
@@ -185,6 +196,7 @@ static void speedstep_set_state(unsigned int state) 


	/* enable IRQs */

	local_irq_restore(flags);

	preempt_enable();



	if (new_state == state)

		pr_debug("change to %u MHz succeeded after %u tries "