|
|
@@ -316,18 +316,19 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
|
|
|
int phy_id = topology_physical_package_id(cpu);
|
|
|
struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu);
|
|
|
bool notify = false;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
if (!phdev)
|
|
|
return;
|
|
|
|
|
|
- spin_lock(&pkg_work_lock);
|
|
|
+ spin_lock_irqsave(&pkg_work_lock, flags);
|
|
|
++pkg_work_cnt;
|
|
|
if (unlikely(phy_id > max_phy_id)) {
|
|
|
- spin_unlock(&pkg_work_lock);
|
|
|
+ spin_unlock_irqrestore(&pkg_work_lock, flags);
|
|
|
return;
|
|
|
}
|
|
|
pkg_work_scheduled[phy_id] = 0;
|
|
|
- spin_unlock(&pkg_work_lock);
|
|
|
+ spin_unlock_irqrestore(&pkg_work_lock, flags);
|
|
|
|
|
|
enable_pkg_thres_interrupt();
|
|
|
rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
|
|
|
@@ -397,6 +398,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
|
|
|
int thres_count;
|
|
|
u32 eax, ebx, ecx, edx;
|
|
|
u8 *temp;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
cpuid(6, &eax, &ebx, &ecx, &edx);
|
|
|
thres_count = ebx & 0x07;
|
|
|
@@ -420,19 +422,19 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
|
|
|
goto err_ret_unlock;
|
|
|
}
|
|
|
|
|
|
- spin_lock(&pkg_work_lock);
|
|
|
+ spin_lock_irqsave(&pkg_work_lock, flags);
|
|
|
if (topology_physical_package_id(cpu) > max_phy_id)
|
|
|
max_phy_id = topology_physical_package_id(cpu);
|
|
|
temp = krealloc(pkg_work_scheduled,
|
|
|
(max_phy_id+1) * sizeof(u8), GFP_ATOMIC);
|
|
|
if (!temp) {
|
|
|
- spin_unlock(&pkg_work_lock);
|
|
|
+ spin_unlock_irqrestore(&pkg_work_lock, flags);
|
|
|
err = -ENOMEM;
|
|
|
goto err_ret_free;
|
|
|
}
|
|
|
pkg_work_scheduled = temp;
|
|
|
pkg_work_scheduled[topology_physical_package_id(cpu)] = 0;
|
|
|
- spin_unlock(&pkg_work_lock);
|
|
|
+ spin_unlock_irqrestore(&pkg_work_lock, flags);
|
|
|
|
|
|
phy_dev_entry->phys_proc_id = topology_physical_package_id(cpu);
|
|
|
phy_dev_entry->first_cpu = cpu;
|
Zhang Rui