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

Merge branch 'thermal-intel-fixes' 

Merge Intel thermal driver fixes for 6.3-rc5:

 - Fix handling of two recently added module parameters in the Intel
   powerclamp thermal driver (David Arcari).

 - Fix one more deadlock in the int340x thermal driver (Srinivas
   Pandruvada).

* thermal-intel-fixes:
  thermal: intel: powerclamp: Fix cpumask and max_idle module parameters
  thermal: intel: int340x: processor_thermal: Fix additional deadlock
parents b57841fb ae817e61

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp 
		cancel_delayed_work_sync(&pci_info->work);

		proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);

		proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, 0);

		thermal_zone_device_disable(tzd);

		pci_info->stored_thres = 0;

		return 0;

	}

drivers/thermal/intel/intel_powerclamp.c

+8 −1
Original line number Diff line number Diff line
@@ -235,6 +235,12 @@ static int max_idle_set(const char *arg, const struct kernel_param *kp) 
		goto skip_limit_set;

	}



	if (!cpumask_available(idle_injection_cpu_mask)) {

		ret = allocate_copy_idle_injection_mask(cpu_present_mask);

		if (ret)

			goto skip_limit_set;

	}



	if (check_invalid(idle_injection_cpu_mask, new_max_idle)) {

		ret = -EINVAL;

		goto skip_limit_set;
@@ -791,6 +797,7 @@ static int __init powerclamp_init(void) 
		return retval;



	mutex_lock(&powerclamp_lock);

	if (!cpumask_available(idle_injection_cpu_mask))

		retval = allocate_copy_idle_injection_mask(cpu_present_mask);

	mutex_unlock(&powerclamp_lock);