Skip to content

Commit f82fabe

Browse files
Kuppuswamy Sathyanarayananrafaeljw
authored andcommitted
thermal: intel: int340x: processor: Move RAPL defaults to MMIO driver
Previously, the MMIO and MSR RAPL interfaces shared the same set of RAPL defaults provided by common code. However, unlike the MSR interface, the MMIO RAPL interface does not require CPU-specific variations in its default handling. Keeping the RAPL defaults in the RAPL common driver therefore provides no additional benefit. Move the MMIO defaults into the MMIO interface driver. This change includes the following updates: * Introduce a MMIO-local rapl_defaults instance with the appropriate default callbacks. * Assign the MMIO-specific rapl_defaults to priv->defaults during MMIO driver initialization. No functional changes are expected. Co-developed-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://patch.msgid.link/20260212233044.329790-11-sathyanarayanan.kuppuswamy@linux.intel.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 22e729c commit f82fabe

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ static const struct rapl_mmio_regs rapl_mmio_default = {
1919
.limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2),
2020
};
2121

22+
static const struct rapl_defaults rapl_defaults_mmio = {
23+
.floor_freq_reg_addr = 0,
24+
.check_unit = rapl_default_check_unit,
25+
.set_floor_freq = rapl_default_set_floor_freq,
26+
.compute_time_window = rapl_default_compute_time_window,
27+
};
28+
2229
static int rapl_mmio_read_raw(int cpu, struct reg_action *ra, bool atomic)
2330
{
2431
if (!ra->reg.mmio)
@@ -67,6 +74,7 @@ int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc
6774

6875
rapl_mmio_priv.read_raw = rapl_mmio_read_raw;
6976
rapl_mmio_priv.write_raw = rapl_mmio_write_raw;
77+
rapl_mmio_priv.defaults = &rapl_defaults_mmio;
7078

7179
rapl_mmio_priv.control_type = powercap_register_control_type(NULL, "intel-rapl-mmio", NULL);
7280
if (IS_ERR(rapl_mmio_priv.control_type)) {

0 commit comments

Comments
 (0)