Skip to content

Commit 3a47fbd

Browse files
committed
Merge branch 'thermal-intel'
Merge updates of Intel thermal drivers for v6.10: - Add missing MODULE_DESCRIPTION() to multiple files in the int340x_thermal and intel_soc_dts_iosf drivers (Srinivas Pandruvada). - Adjust the update delay and capabilities-per-event values in the Intel HFI thermal driver to prevent it from missing events and allow it to process more data in one go (Ricardo Neri). * thermal-intel: thermal: intel: hfi: Increase the number of CPU capabilities per netlink event thermal: intel: hfi: Rename HFI_MAX_THERM_NOTIFY_COUNT thermal: intel: hfi: Shorten the thermal netlink event delay to 100ms thermal: intel: hfi: Rename HFI_UPDATE_INTERVAL thermal: intel: Add missing module description
2 parents 9396b2a + 608fa85 commit 3a47fbd

File tree

8 files changed

+15
-8
lines changed

8 files changed

+15
-8
lines changed

drivers/thermal/intel/int340x_thermal/processor_thermal_mbox.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,4 @@ int processor_thermal_mbox_interrupt_config(struct pci_dev *pdev, bool enable,
156156
EXPORT_SYMBOL_NS_GPL(processor_thermal_mbox_interrupt_config, INT340X_THERMAL);
157157

158158
MODULE_LICENSE("GPL v2");
159+
MODULE_DESCRIPTION("Processor Thermal Mail Box Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_power_floor.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,4 @@ EXPORT_SYMBOL_NS_GPL(proc_thermal_power_floor_intr_callback, INT340X_THERMAL);
124124

125125
MODULE_IMPORT_NS(INT340X_THERMAL);
126126
MODULE_LICENSE("GPL");
127+
MODULE_DESCRIPTION("Processor Thermal power floor notification Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ void proc_thermal_rapl_remove(void)
133133
EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove);
134134

135135
MODULE_LICENSE("GPL v2");
136+
MODULE_DESCRIPTION("RAPL interface using MMIO");

drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,3 +384,4 @@ void proc_thermal_rfim_remove(struct pci_dev *pdev)
384384
EXPORT_SYMBOL_GPL(proc_thermal_rfim_remove);
385385

386386
MODULE_LICENSE("GPL v2");
387+
MODULE_DESCRIPTION("Processor Thermal RFIM Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_wt_hint.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,4 @@ EXPORT_SYMBOL_NS_GPL(proc_thermal_wt_hint_remove, INT340X_THERMAL);
253253

254254
MODULE_IMPORT_NS(INT340X_THERMAL);
255255
MODULE_LICENSE("GPL");
256+
MODULE_DESCRIPTION("Processor Thermal Work Load type hint Interface");

drivers/thermal/intel/int340x_thermal/processor_thermal_wt_req.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ EXPORT_SYMBOL_GPL(proc_thermal_wt_req_remove);
134134

135135
MODULE_IMPORT_NS(INT340X_THERMAL);
136136
MODULE_LICENSE("GPL");
137+
MODULE_DESCRIPTION("Processor Thermal Work Load type request Interface");

drivers/thermal/intel/intel_hfi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ static struct hfi_features hfi_features;
166166
static DEFINE_MUTEX(hfi_instance_lock);
167167

168168
static struct workqueue_struct *hfi_updates_wq;
169-
#define HFI_UPDATE_INTERVAL HZ
170-
#define HFI_MAX_THERM_NOTIFY_COUNT 16
169+
#define HFI_UPDATE_DELAY_MS 100
170+
#define HFI_THERMNL_CAPS_PER_EVENT 64
171171

172172
static void get_hfi_caps(struct hfi_instance *hfi_instance,
173173
struct thermal_genl_cpu_caps *cpu_caps)
@@ -218,14 +218,14 @@ static void update_capabilities(struct hfi_instance *hfi_instance)
218218

219219
get_hfi_caps(hfi_instance, cpu_caps);
220220

221-
if (cpu_count < HFI_MAX_THERM_NOTIFY_COUNT)
221+
if (cpu_count < HFI_THERMNL_CAPS_PER_EVENT)
222222
goto last_cmd;
223223

224-
/* Process complete chunks of HFI_MAX_THERM_NOTIFY_COUNT capabilities. */
224+
/* Process complete chunks of HFI_THERMNL_CAPS_PER_EVENT capabilities. */
225225
for (i = 0;
226-
(i + HFI_MAX_THERM_NOTIFY_COUNT) <= cpu_count;
227-
i += HFI_MAX_THERM_NOTIFY_COUNT)
228-
thermal_genl_cpu_capability_event(HFI_MAX_THERM_NOTIFY_COUNT,
226+
(i + HFI_THERMNL_CAPS_PER_EVENT) <= cpu_count;
227+
i += HFI_THERMNL_CAPS_PER_EVENT)
228+
thermal_genl_cpu_capability_event(HFI_THERMNL_CAPS_PER_EVENT,
229229
&cpu_caps[i]);
230230

231231
cpu_count = cpu_count - i;
@@ -322,7 +322,7 @@ void intel_hfi_process_event(__u64 pkg_therm_status_msr_val)
322322
raw_spin_unlock(&hfi_instance->event_lock);
323323

324324
queue_delayed_work(hfi_updates_wq, &hfi_instance->update_work,
325-
HFI_UPDATE_INTERVAL);
325+
msecs_to_jiffies(HFI_UPDATE_DELAY_MS));
326326
}
327327

328328
static void init_hfi_cpu_index(struct hfi_cpu_info *info)

drivers/thermal/intel/intel_soc_dts_iosf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,3 +387,4 @@ EXPORT_SYMBOL_GPL(intel_soc_dts_iosf_exit);
387387

388388
MODULE_IMPORT_NS(INTEL_TCC);
389389
MODULE_LICENSE("GPL v2");
390+
MODULE_DESCRIPTION("SoC DTS driver using side band interface");

0 commit comments

Comments
 (0)