Commit f82fabe1 authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by Rafael J. Wysocki
Browse files

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: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://patch.msgid.link/20260212233044.329790-11-sathyanarayanan.kuppuswamy@linux.intel.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 22e729c5

drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ static const struct rapl_mmio_regs rapl_mmio_default = { 
	.limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2),

};



static const struct rapl_defaults rapl_defaults_mmio = {

	.floor_freq_reg_addr = 0,

	.check_unit = rapl_default_check_unit,

	.set_floor_freq = rapl_default_set_floor_freq,

	.compute_time_window = rapl_default_compute_time_window,

};



static int rapl_mmio_read_raw(int cpu, struct reg_action *ra, bool atomic)

{

	if (!ra->reg.mmio)
@@ -67,6 +74,7 @@ int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc 


	rapl_mmio_priv.read_raw = rapl_mmio_read_raw;

	rapl_mmio_priv.write_raw = rapl_mmio_write_raw;

	rapl_mmio_priv.defaults = &rapl_defaults_mmio;



	rapl_mmio_priv.control_type = powercap_register_control_type(NULL, "intel-rapl-mmio", NULL);

	if (IS_ERR(rapl_mmio_priv.control_type)) {