powercap: intel_rapl: Move TPMI default settings into TPMI interface driver

TPMI-specific RAPL defaults differ from those used by MSR and MMIO
interfaces. Keeping them in RAPL common driver introduces unnecessary
complexity.

Move the TPMI defaults into the TPMI interface driver. This change
includes the following updates:

1. Add a TPMI-local struct rapl_defaults instance and assign it to
priv->defaults during TPMI probe.
2. Move rapl_check_unit_tpmi() and related unit-field definitions from
the common driver into the TPMI driver.
3. In rapl_check_unit_tpmi(), replace the generic get_rid() usage with
direct access to the TPMI package ID, since the function is now
interface-specific.

No functional changes are intended.

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-10-sathyanarayanan.kuppuswamy@linux.intel.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 7c95eb658c160d8055f765f1b25b3fbf8164f612..6a2153039f731e82a995a80ab9e9963ae4907061 100644 (file)
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -108,14 +108,6 @@
 #define PACKAGE_PLN_INT_SAVED          BIT(0)
 #define MAX_PRIM_NAME                  32
 
-/* TPMI Unit register has different layout */
-#define TPMI_POWER_UNIT_OFFSET         POWER_UNIT_OFFSET
-#define TPMI_POWER_UNIT_MASK           POWER_UNIT_MASK
-#define TPMI_ENERGY_UNIT_OFFSET                0x06
-#define TPMI_ENERGY_UNIT_MASK          GENMASK_ULL(10, 6)
-#define TPMI_TIME_UNIT_OFFSET          0x0C
-#define TPMI_TIME_UNIT_MASK            GENMASK_ULL(15, 12)
-
 #define RAPL_EVENT_MASK                        GENMASK(7, 0)
 
 enum unit_type {
@@ -222,7 +214,6 @@ static int get_pl_prim(struct rapl_domain *rd, int pl, enum pl_prims prim)
        container_of(_zone, struct rapl_domain, power_zone)
 
 static const struct rapl_defaults *defaults_msr;
-static const struct rapl_defaults defaults_tpmi;
 
 static const struct rapl_defaults *get_defaults(struct rapl_package *rp)
 {
@@ -779,7 +770,6 @@ static int rapl_config(struct rapl_package *rp)
                rp->priv->rpi = (void *)rpi_msr;
                break;
        case RAPL_IF_TPMI:
-               rp->priv->defaults = &defaults_tpmi;
                rp->priv->rpi = (void *)rpi_tpmi;
                break;
        default:
@@ -1148,41 +1138,6 @@ static u64 rapl_compute_time_window_atom(struct rapl_domain *rd, u64 value,
        return (value) ? value * rd->time_unit : rd->time_unit;
 }
 
-static int rapl_check_unit_tpmi(struct rapl_domain *rd)
-{
-       struct reg_action ra;
-       u32 value;
-
-       ra.reg = rd->regs[RAPL_DOMAIN_REG_UNIT];
-       ra.mask = ~0;
-       if (rd->rp->priv->read_raw(get_rid(rd->rp), &ra, false)) {
-               pr_err("Failed to read power unit REG 0x%llx on %s:%s, exit.\n",
-                       ra.reg.val, rd->rp->name, rd->name);
-               return -ENODEV;
-       }
-
-       value = (ra.value & TPMI_ENERGY_UNIT_MASK) >> TPMI_ENERGY_UNIT_OFFSET;
-       rd->energy_unit = (ENERGY_UNIT_SCALE * MICROJOULE_PER_JOULE) >> value;
-
-       value = (ra.value & TPMI_POWER_UNIT_MASK) >> TPMI_POWER_UNIT_OFFSET;
-       rd->power_unit = MICROWATT_PER_WATT >> value;
-
-       value = (ra.value & TPMI_TIME_UNIT_MASK) >> TPMI_TIME_UNIT_OFFSET;
-       rd->time_unit = USEC_PER_SEC >> value;
-
-       pr_debug("Core CPU %s:%s energy=%dpJ, time=%dus, power=%duW\n",
-                rd->rp->name, rd->name, rd->energy_unit, rd->time_unit, rd->power_unit);
-
-       return 0;
-}
-
-static const struct rapl_defaults defaults_tpmi = {
-       .check_unit = rapl_check_unit_tpmi,
-       /* Reuse existing logic, ignore the PL_CLAMP failures and enable all Power Limits */
-       .set_floor_freq = rapl_default_set_floor_freq,
-       .compute_time_window = rapl_default_compute_time_window,
-};
-
 static const struct rapl_defaults rapl_defaults_core = {
        .floor_freq_reg_addr = 0,
        .check_unit = rapl_default_check_unit,

diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
index 1fa821376dde2e11a9477b80f9c993bf48ede1fa..c06d687366fcf8036b56204eb3106f6d834a810c 100644 (file)
--- a/drivers/powercap/intel_rapl_tpmi.c
+++ b/drivers/powercap/intel_rapl_tpmi.c
@@ -9,12 +9,14 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/auxiliary_bus.h>
+#include <linux/bits.h>
 #include <linux/intel_rapl.h>
 #include <linux/intel_tpmi.h>
 #include <linux/intel_vsec.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/units.h>
 
 #define TPMI_RAPL_MAJOR_VERSION 0
 #define TPMI_RAPL_MINOR_VERSION 1
@@ -250,6 +252,50 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
        return 0;
 }
 
+/* TPMI Unit register has different layout */
+#define TPMI_ENERGY_UNIT_SCALE         1000
+#define TPMI_POWER_UNIT_OFFSET         0x00
+#define TPMI_POWER_UNIT_MASK           GENMASK(3, 0)
+#define TPMI_ENERGY_UNIT_OFFSET                0x06
+#define TPMI_ENERGY_UNIT_MASK          GENMASK_ULL(10, 6)
+#define TPMI_TIME_UNIT_OFFSET          0x0C
+#define TPMI_TIME_UNIT_MASK            GENMASK_ULL(15, 12)
+
+static int rapl_check_unit_tpmi(struct rapl_domain *rd)
+{
+       struct reg_action ra;
+       u32 value;
+
+       ra.reg = rd->regs[RAPL_DOMAIN_REG_UNIT];
+       ra.mask = ~0;
+       if (tpmi_rapl_read_raw(rd->rp->id, &ra, false)) {
+               pr_err("Failed to read power unit REG 0x%llx on %s:%s, exit.\n",
+                       ra.reg.val, rd->rp->name, rd->name);
+               return -ENODEV;
+       }
+
+       value = (ra.value & TPMI_ENERGY_UNIT_MASK) >> TPMI_ENERGY_UNIT_OFFSET;
+       rd->energy_unit = (TPMI_ENERGY_UNIT_SCALE * MICROJOULE_PER_JOULE) >> value;
+
+       value = (ra.value & TPMI_POWER_UNIT_MASK) >> TPMI_POWER_UNIT_OFFSET;
+       rd->power_unit = MICROWATT_PER_WATT >> value;
+
+       value = (ra.value & TPMI_TIME_UNIT_MASK) >> TPMI_TIME_UNIT_OFFSET;
+       rd->time_unit = USEC_PER_SEC >> value;
+
+       pr_debug("Core CPU %s:%s energy=%dpJ, time=%dus, power=%duW\n",
+                rd->rp->name, rd->name, rd->energy_unit, rd->time_unit, rd->power_unit);
+
+       return 0;
+}
+
+static const struct rapl_defaults defaults_tpmi = {
+       .check_unit = rapl_check_unit_tpmi,
+       /* Reuse existing logic, ignore the PL_CLAMP failures and enable all Power Limits */
+       .set_floor_freq = rapl_default_set_floor_freq,
+       .compute_time_window = rapl_default_compute_time_window,
+};
+
 static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,
                                 const struct auxiliary_device_id *id)
 {
@@ -297,6 +343,7 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,
        trp->priv.read_raw = tpmi_rapl_read_raw;
        trp->priv.write_raw = tpmi_rapl_write_raw;
        trp->priv.control_type = tpmi_control_type;
+       trp->priv.defaults = &defaults_tpmi;
 
        /* RAPL TPMI I/F is per physical package */
        trp->rp = rapl_find_package_domain(info->package_id, &trp->priv, false);