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

Commit 6789f873 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki
 "These fix two issues related to the RAPL MMIO interface support added
  recently and one cpufreq driver issue.

  Specifics:

   - Initialize the power capping subsystem and the RAPL driver earlier
     in case the int340X thermal driver is built-in and attempts to
     register an MMIO interface for RAPL which must not happen before
     the requisite infrastructure is ready (Zhang Rui)

   - Fix the int340X thermal driver's RAPL MMIO interface registration
     error path (Rafael Wysocki)

   - Fix possible use-after-free in the pasemi cpufreq driver (Wen
     Yang)"

* tag 'pm-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()
  int340X/processor_thermal_device: Fix proc_thermal_rapl_remove()
  powercap: Invoke powercap_init() and rapl_init() earlier
parents a51edf75 fdc75701

drivers/cpufreq/pasemi-cpufreq.c

+9 −14
Original line number Diff line number Diff line
@@ -131,10 +131,18 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	int err = -ENODEV;



	cpu = of_get_cpu_node(policy->cpu, NULL);

	if (!cpu)

		goto out;



	max_freqp = of_get_property(cpu, "clock-frequency", NULL);

	of_node_put(cpu);

	if (!cpu)

	if (!max_freqp) {

		err = -EINVAL;

		goto out;

	}



	/* we need the freq in kHz */

	max_freq = *max_freqp / 1000;



	dn = of_find_compatible_node(NULL, NULL, "1682m-sdc");

	if (!dn)
@@ -171,16 +179,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	}



	pr_debug("init cpufreq on CPU %d\n", policy->cpu);



	max_freqp = of_get_property(cpu, "clock-frequency", NULL);

	if (!max_freqp) {

		err = -EINVAL;

		goto out_unmap_sdcpwr;

	}



	/* we need the freq in kHz */

	max_freq = *max_freqp / 1000;



	pr_debug("max clock-frequency is at %u kHz\n", max_freq);

	pr_debug("initializing frequency table\n");
@@ -199,9 +197,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());

	return 0;



out_unmap_sdcpwr:

	iounmap(sdcpwr_mapbase);



out_unmap_sdcasr:

	iounmap(sdcasr_mapbase);

out:

drivers/powercap/intel_rapl_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ static void __exit rapl_exit(void) 
	unregister_pm_notifier(&rapl_pm_notifier);

}



module_init(rapl_init);

fs_initcall(rapl_init);

module_exit(rapl_exit);



MODULE_DESCRIPTION("Intel Runtime Average Power Limit (RAPL) common code");

drivers/powercap/powercap_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int __init powercap_init(void) 
	return class_register(&powercap_class);

}



device_initcall(powercap_init);

fs_initcall(powercap_init);



MODULE_DESCRIPTION("PowerCap sysfs Driver");

MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");

drivers/thermal/intel/int340x_thermal/processor_thermal_device.c

+4 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct pci_dev *pdev, 
				rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep);

	if (ret < 0) {

		powercap_unregister_control_type(rapl_mmio_priv.control_type);

		rapl_mmio_priv.control_type = NULL;

		return ret;

	}

	rapl_mmio_priv.pcap_rapl_online = ret;
@@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct pci_dev *pdev, 


static void proc_thermal_rapl_remove(void)

{

	if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))

		return;



	cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);

	powercap_unregister_control_type(rapl_mmio_priv.control_type);

}