]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
powercap: intel_rapl: Cleanup coding style
authorKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Thu, 12 Feb 2026 23:30:34 +0000 (15:30 -0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Mar 2026 14:52:39 +0000 (15:52 +0100)
Improve code readability and consistency by:
  - Aligning macro definitions vertically
  - Reformatting primitive info arrays with consistent indentation
  - Aligning CPU ID table entries
  - Reorganizing macro definitions for better logical grouping
  - Using consistent hex formatting (0x00 instead of 0)
  - Capitalizing hex digits consistently (0xDF instead of 0xdf)
  - Removing unnecessary parentheses around numeric constants

No functional changes.

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-3-sathyanarayanan.kuppuswamy@linux.intel.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/powercap/intel_rapl_common.c

index f05a72d7d34014ccfaec96d2ff59b6ee7d9d0f82..207825246724a17286e0499760a32744abb71a70 100644 (file)
 #include <asm/msr.h>
 
 /* bitmasks for RAPL MSRs, used by primitive access functions */
-#define ENERGY_STATUS_MASK      0xffffffff
+#define ENERGY_STATUS_MASK             0xffffffff
 
-#define POWER_LIMIT1_MASK       0x7FFF
-#define POWER_LIMIT1_ENABLE     BIT(15)
-#define POWER_LIMIT1_CLAMP      BIT(16)
+#define POWER_LIMIT1_MASK              0x7FFF
+#define POWER_LIMIT1_ENABLE            BIT(15)
+#define POWER_LIMIT1_CLAMP             BIT(16)
 
-#define POWER_LIMIT2_MASK       (0x7FFFULL<<32)
-#define POWER_LIMIT2_ENABLE     BIT_ULL(47)
-#define POWER_LIMIT2_CLAMP      BIT_ULL(48)
-#define POWER_HIGH_LOCK         BIT_ULL(63)
-#define POWER_LOW_LOCK          BIT(31)
+#define POWER_LIMIT2_MASK              (0x7FFFULL<<32)
+#define POWER_LIMIT2_ENABLE            BIT_ULL(47)
+#define POWER_LIMIT2_CLAMP             BIT_ULL(48)
+#define POWER_HIGH_LOCK                        BIT_ULL(63)
+#define POWER_LOW_LOCK                 BIT(31)
 
 #define POWER_LIMIT4_MASK              0x1FFF
 
-#define TIME_WINDOW1_MASK       (0x7FULL<<17)
-#define TIME_WINDOW2_MASK       (0x7FULL<<49)
+#define TIME_WINDOW1_MASK              (0x7FULL<<17)
+#define TIME_WINDOW2_MASK              (0x7FULL<<49)
 
-#define POWER_UNIT_OFFSET      0
-#define POWER_UNIT_MASK                0x0F
+#define POWER_UNIT_OFFSET              0x00
+#define POWER_UNIT_MASK                        0x0F
 
-#define ENERGY_UNIT_OFFSET     0x08
-#define ENERGY_UNIT_MASK       0x1F00
+#define ENERGY_UNIT_OFFSET             0x08
+#define ENERGY_UNIT_MASK               0x1F00
 
-#define TIME_UNIT_OFFSET       0x10
-#define TIME_UNIT_MASK         0xF0000
+#define TIME_UNIT_OFFSET               0x10
+#define TIME_UNIT_MASK                 0xF0000
 
-#define POWER_INFO_MAX_MASK     (0x7fffULL<<32)
-#define POWER_INFO_MIN_MASK     (0x7fffULL<<16)
-#define POWER_INFO_MAX_TIME_WIN_MASK     (0x3fULL<<48)
-#define POWER_INFO_THERMAL_SPEC_MASK     0x7fff
+#define POWER_INFO_MAX_MASK            (0x7fffULL<<32)
+#define POWER_INFO_MIN_MASK            (0x7fffULL<<16)
+#define POWER_INFO_MAX_TIME_WIN_MASK   (0x3fULL<<48)
+#define POWER_INFO_THERMAL_SPEC_MASK   0x7fff
 
-#define PERF_STATUS_THROTTLE_TIME_MASK 0xffffffff
-#define PP_POLICY_MASK         0x1F
+#define PERF_STATUS_THROTTLE_TIME_MASK 0xffffffff
+#define PP_POLICY_MASK                 0x1F
 
 /*
  * SPR has different layout for Psys Domain PowerLimit registers.
  * There are 17 bits of PL1 and PL2 instead of 15 bits.
  * The Enable bits and TimeWindow bits are also shifted as a result.
  */
-#define PSYS_POWER_LIMIT1_MASK       0x1FFFF
-#define PSYS_POWER_LIMIT1_ENABLE     BIT(17)
+#define PSYS_POWER_LIMIT1_MASK         0x1FFFF
+#define PSYS_POWER_LIMIT1_ENABLE       BIT(17)
 
-#define PSYS_POWER_LIMIT2_MASK       (0x1FFFFULL<<32)
-#define PSYS_POWER_LIMIT2_ENABLE     BIT_ULL(49)
+#define PSYS_POWER_LIMIT2_MASK         (0x1FFFFULL<<32)
+#define PSYS_POWER_LIMIT2_ENABLE       BIT_ULL(49)
 
-#define PSYS_TIME_WINDOW1_MASK       (0x7FULL<<19)
-#define PSYS_TIME_WINDOW2_MASK       (0x7FULL<<51)
+#define PSYS_TIME_WINDOW1_MASK         (0x7FULL<<19)
+#define PSYS_TIME_WINDOW2_MASK         (0x7FULL<<51)
 
 /* bitmasks for RAPL TPMI, used by primitive access functions */
-#define TPMI_POWER_LIMIT_MASK  0x3FFFF
-#define TPMI_POWER_LIMIT_ENABLE        BIT_ULL(62)
-#define TPMI_TIME_WINDOW_MASK  (0x7FULL<<18)
-#define TPMI_INFO_SPEC_MASK    0x3FFFF
-#define TPMI_INFO_MIN_MASK     (0x3FFFFULL << 18)
-#define TPMI_INFO_MAX_MASK     (0x3FFFFULL << 36)
+#define TPMI_POWER_LIMIT_MASK          0x3FFFF
+#define TPMI_POWER_LIMIT_ENABLE                BIT_ULL(62)
+#define TPMI_TIME_WINDOW_MASK          (0x7FULL<<18)
+#define TPMI_INFO_SPEC_MASK            0x3FFFF
+#define TPMI_INFO_MIN_MASK             (0x3FFFFULL << 18)
+#define TPMI_INFO_MAX_MASK             (0x3FFFFULL << 36)
 #define TPMI_INFO_MAX_TIME_WIN_MASK    (0x7FULL << 54)
 
 /* Non HW constants */
-#define RAPL_PRIMITIVE_DERIVED       BIT(1)    /* not from raw data */
-#define RAPL_PRIMITIVE_DUMMY         BIT(2)
+#define RAPL_PRIMITIVE_DERIVED         BIT(1)  /* not from raw data */
+#define RAPL_PRIMITIVE_DUMMY           BIT(2)
+
+#define ENERGY_UNIT_SCALE              1000    /* scale from driver unit to powercap unit */
+
+/* per domain data, some are optional */
+#define NR_RAW_PRIMITIVES              (NR_RAPL_PRIMITIVES - 2)
+
+#define        DOMAIN_STATE_INACTIVE           BIT(0)
+#define        DOMAIN_STATE_POWER_LIMIT_SET    BIT(1)
+
+/* Sideband MBI registers */
+#define IOSF_CPU_POWER_BUDGET_CTL_BYT  0x02
+#define IOSF_CPU_POWER_BUDGET_CTL_TNG  0xDF
+
+#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          0x7C0
+#define TPMI_TIME_UNIT_OFFSET          0x0C
+#define TPMI_TIME_UNIT_MASK            0xF000
+
+#define RAPL_EVENT_MASK                        GENMASK(7, 0)
+
+#define TIME_WINDOW_MAX_MSEC           40000
+#define TIME_WINDOW_MIN_MSEC           250
 
-#define TIME_WINDOW_MAX_MSEC 40000
-#define TIME_WINDOW_MIN_MSEC 250
-#define ENERGY_UNIT_SCALE    1000      /* scale from driver unit to powercap unit */
 enum unit_type {
        ARBITRARY_UNIT,         /* no translation */
        POWER_UNIT,
@@ -102,12 +127,6 @@ enum unit_type {
        TIME_UNIT,
 };
 
-/* per domain data, some are optional */
-#define NR_RAW_PRIMITIVES (NR_RAPL_PRIMITIVES - 2)
-
-#define        DOMAIN_STATE_INACTIVE           BIT(0)
-#define        DOMAIN_STATE_POWER_LIMIT_SET    BIT(1)
-
 static const char *pl_names[NR_POWER_LIMITS] = {
        [POWER_LIMIT1] = "long_term",
        [POWER_LIMIT2] = "short_term",
@@ -222,13 +241,6 @@ static struct rapl_defaults *get_defaults(struct rapl_package *rp)
        return rp->priv->defaults;
 }
 
-/* Sideband MBI registers */
-#define IOSF_CPU_POWER_BUDGET_CTL_BYT (0x2)
-#define IOSF_CPU_POWER_BUDGET_CTL_TNG (0xdf)
-
-#define PACKAGE_PLN_INT_SAVED   BIT(0)
-#define MAX_PRIM_NAME (32)
-
 /* per domain data. used to describe individual knobs such that access function
  * can be consolidated into one instead of many inline functions.
  */
@@ -659,99 +671,104 @@ static u64 rapl_unit_xlate(struct rapl_domain *rd, enum unit_type type,
 /* RAPL primitives for MSR and MMIO I/F */
 static struct rapl_primitive_info rpi_msr[NR_RAPL_PRIMITIVES] = {
        /* name, mask, shift, msr index, unit divisor */
-       [POWER_LIMIT1] = PRIMITIVE_INFO_INIT(POWER_LIMIT1, POWER_LIMIT1_MASK, 0,
-                           RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
-       [POWER_LIMIT2] = PRIMITIVE_INFO_INIT(POWER_LIMIT2, POWER_LIMIT2_MASK, 32,
-                           RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
-       [POWER_LIMIT4] = PRIMITIVE_INFO_INIT(POWER_LIMIT4, POWER_LIMIT4_MASK, 0,
-                               RAPL_DOMAIN_REG_PL4, POWER_UNIT, 0),
-       [ENERGY_COUNTER] = PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,
-                           RAPL_DOMAIN_REG_STATUS, ENERGY_UNIT, 0),
-       [FW_LOCK] = PRIMITIVE_INFO_INIT(FW_LOCK, POWER_LOW_LOCK, 31,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [FW_HIGH_LOCK] = PRIMITIVE_INFO_INIT(FW_LOCK, POWER_HIGH_LOCK, 63,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL1_ENABLE] = PRIMITIVE_INFO_INIT(PL1_ENABLE, POWER_LIMIT1_ENABLE, 15,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL1_CLAMP] = PRIMITIVE_INFO_INIT(PL1_CLAMP, POWER_LIMIT1_CLAMP, 16,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL2_ENABLE] = PRIMITIVE_INFO_INIT(PL2_ENABLE, POWER_LIMIT2_ENABLE, 47,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL2_CLAMP] = PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [TIME_WINDOW1] = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17,
-                           RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
-       [TIME_WINDOW2] = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49,
-                           RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
-       [THERMAL_SPEC_POWER] = PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER, POWER_INFO_THERMAL_SPEC_MASK,
-                           0, RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MAX_POWER] = PRIMITIVE_INFO_INIT(MAX_POWER, POWER_INFO_MAX_MASK, 32,
-                           RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MIN_POWER] = PRIMITIVE_INFO_INIT(MIN_POWER, POWER_INFO_MIN_MASK, 16,
-                           RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MAX_TIME_WINDOW] = PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW, POWER_INFO_MAX_TIME_WIN_MASK, 48,
-                           RAPL_DOMAIN_REG_INFO, TIME_UNIT, 0),
-       [THROTTLED_TIME] = PRIMITIVE_INFO_INIT(THROTTLED_TIME, PERF_STATUS_THROTTLE_TIME_MASK, 0,
-                           RAPL_DOMAIN_REG_PERF, TIME_UNIT, 0),
-       [PRIORITY_LEVEL] = PRIMITIVE_INFO_INIT(PRIORITY_LEVEL, PP_POLICY_MASK, 0,
-                           RAPL_DOMAIN_REG_POLICY, ARBITRARY_UNIT, 0),
-       [PSYS_POWER_LIMIT1] = PRIMITIVE_INFO_INIT(PSYS_POWER_LIMIT1, PSYS_POWER_LIMIT1_MASK, 0,
-                           RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
-       [PSYS_POWER_LIMIT2] = PRIMITIVE_INFO_INIT(PSYS_POWER_LIMIT2, PSYS_POWER_LIMIT2_MASK, 32,
-                           RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
-       [PSYS_PL1_ENABLE] = PRIMITIVE_INFO_INIT(PSYS_PL1_ENABLE, PSYS_POWER_LIMIT1_ENABLE, 17,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PSYS_PL2_ENABLE] = PRIMITIVE_INFO_INIT(PSYS_PL2_ENABLE, PSYS_POWER_LIMIT2_ENABLE, 49,
-                           RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PSYS_TIME_WINDOW1] = PRIMITIVE_INFO_INIT(PSYS_TIME_WINDOW1, PSYS_TIME_WINDOW1_MASK, 19,
-                           RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
-       [PSYS_TIME_WINDOW2] = PRIMITIVE_INFO_INIT(PSYS_TIME_WINDOW2, PSYS_TIME_WINDOW2_MASK, 51,
-                           RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
+       [POWER_LIMIT1]          = PRIMITIVE_INFO_INIT(POWER_LIMIT1, POWER_LIMIT1_MASK, 0,
+                                                     RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+       [POWER_LIMIT2]          = PRIMITIVE_INFO_INIT(POWER_LIMIT2, POWER_LIMIT2_MASK, 32,
+                                                     RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+       [POWER_LIMIT4]          = PRIMITIVE_INFO_INIT(POWER_LIMIT4, POWER_LIMIT4_MASK, 0,
+                                                     RAPL_DOMAIN_REG_PL4, POWER_UNIT, 0),
+       [ENERGY_COUNTER]        = PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,
+                                                     RAPL_DOMAIN_REG_STATUS, ENERGY_UNIT, 0),
+       [FW_LOCK]               = PRIMITIVE_INFO_INIT(FW_LOCK, POWER_LOW_LOCK, 31,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [FW_HIGH_LOCK]          = PRIMITIVE_INFO_INIT(FW_LOCK, POWER_HIGH_LOCK, 63,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL1_ENABLE]            = PRIMITIVE_INFO_INIT(PL1_ENABLE, POWER_LIMIT1_ENABLE, 15,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL1_CLAMP]             = PRIMITIVE_INFO_INIT(PL1_CLAMP, POWER_LIMIT1_CLAMP, 16,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL2_ENABLE]            = PRIMITIVE_INFO_INIT(PL2_ENABLE, POWER_LIMIT2_ENABLE, 47,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL2_CLAMP]             = PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [TIME_WINDOW1]          = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17,
+                                                     RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
+       [TIME_WINDOW2]          = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49,
+                                                     RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
+       [THERMAL_SPEC_POWER]    = PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER,
+                                                     POWER_INFO_THERMAL_SPEC_MASK, 0,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MAX_POWER]             = PRIMITIVE_INFO_INIT(MAX_POWER, POWER_INFO_MAX_MASK, 32,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MIN_POWER]             = PRIMITIVE_INFO_INIT(MIN_POWER, POWER_INFO_MIN_MASK, 16,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MAX_TIME_WINDOW]       = PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW,
+                                                     POWER_INFO_MAX_TIME_WIN_MASK, 48,
+                                                     RAPL_DOMAIN_REG_INFO, TIME_UNIT, 0),
+       [THROTTLED_TIME]        = PRIMITIVE_INFO_INIT(THROTTLED_TIME,
+                                                     PERF_STATUS_THROTTLE_TIME_MASK, 0,
+                                                     RAPL_DOMAIN_REG_PERF, TIME_UNIT, 0),
+       [PRIORITY_LEVEL]        = PRIMITIVE_INFO_INIT(PRIORITY_LEVEL, PP_POLICY_MASK, 0,
+                                                     RAPL_DOMAIN_REG_POLICY, ARBITRARY_UNIT, 0),
+       [PSYS_POWER_LIMIT1]     = PRIMITIVE_INFO_INIT(PSYS_POWER_LIMIT1, PSYS_POWER_LIMIT1_MASK, 0,
+                                                     RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+       [PSYS_POWER_LIMIT2]     = PRIMITIVE_INFO_INIT(PSYS_POWER_LIMIT2, PSYS_POWER_LIMIT2_MASK,
+                                                     32, RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+       [PSYS_PL1_ENABLE]       = PRIMITIVE_INFO_INIT(PSYS_PL1_ENABLE, PSYS_POWER_LIMIT1_ENABLE,
+                                                     17, RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT,
+                                                     0),
+       [PSYS_PL2_ENABLE]       = PRIMITIVE_INFO_INIT(PSYS_PL2_ENABLE, PSYS_POWER_LIMIT2_ENABLE,
+                                                     49, RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT,
+                                                     0),
+       [PSYS_TIME_WINDOW1]     = PRIMITIVE_INFO_INIT(PSYS_TIME_WINDOW1, PSYS_TIME_WINDOW1_MASK,
+                                                     19, RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
+       [PSYS_TIME_WINDOW2]     = PRIMITIVE_INFO_INIT(PSYS_TIME_WINDOW2, PSYS_TIME_WINDOW2_MASK,
+                                                     51, RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
        /* non-hardware */
-       [AVERAGE_POWER] = PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0, POWER_UNIT,
-                           RAPL_PRIMITIVE_DERIVED),
+       [AVERAGE_POWER]         = PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0, POWER_UNIT,
+                                                     RAPL_PRIMITIVE_DERIVED),
 };
 
 /* RAPL primitives for TPMI I/F */
 static struct rapl_primitive_info rpi_tpmi[NR_RAPL_PRIMITIVES] = {
        /* name, mask, shift, msr index, unit divisor */
-       [POWER_LIMIT1] = PRIMITIVE_INFO_INIT(POWER_LIMIT1, TPMI_POWER_LIMIT_MASK, 0,
-               RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
-       [POWER_LIMIT2] = PRIMITIVE_INFO_INIT(POWER_LIMIT2, TPMI_POWER_LIMIT_MASK, 0,
-               RAPL_DOMAIN_REG_PL2, POWER_UNIT, 0),
-       [POWER_LIMIT4] = PRIMITIVE_INFO_INIT(POWER_LIMIT4, TPMI_POWER_LIMIT_MASK, 0,
-               RAPL_DOMAIN_REG_PL4, POWER_UNIT, 0),
-       [ENERGY_COUNTER] = PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,
-               RAPL_DOMAIN_REG_STATUS, ENERGY_UNIT, 0),
-       [PL1_LOCK] = PRIMITIVE_INFO_INIT(PL1_LOCK, POWER_HIGH_LOCK, 63,
-               RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL2_LOCK] = PRIMITIVE_INFO_INIT(PL2_LOCK, POWER_HIGH_LOCK, 63,
-               RAPL_DOMAIN_REG_PL2, ARBITRARY_UNIT, 0),
-       [PL4_LOCK] = PRIMITIVE_INFO_INIT(PL4_LOCK, POWER_HIGH_LOCK, 63,
-               RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),
-       [PL1_ENABLE] = PRIMITIVE_INFO_INIT(PL1_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
-               RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
-       [PL2_ENABLE] = PRIMITIVE_INFO_INIT(PL2_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
-               RAPL_DOMAIN_REG_PL2, ARBITRARY_UNIT, 0),
-       [PL4_ENABLE] = PRIMITIVE_INFO_INIT(PL4_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
-               RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),
-       [TIME_WINDOW1] = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TPMI_TIME_WINDOW_MASK, 18,
-               RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
-       [TIME_WINDOW2] = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TPMI_TIME_WINDOW_MASK, 18,
-               RAPL_DOMAIN_REG_PL2, TIME_UNIT, 0),
-       [THERMAL_SPEC_POWER] = PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER, TPMI_INFO_SPEC_MASK, 0,
-               RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MAX_POWER] = PRIMITIVE_INFO_INIT(MAX_POWER, TPMI_INFO_MAX_MASK, 36,
-               RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MIN_POWER] = PRIMITIVE_INFO_INIT(MIN_POWER, TPMI_INFO_MIN_MASK, 18,
-               RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
-       [MAX_TIME_WINDOW] = PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW, TPMI_INFO_MAX_TIME_WIN_MASK, 54,
-               RAPL_DOMAIN_REG_INFO, TIME_UNIT, 0),
-       [THROTTLED_TIME] = PRIMITIVE_INFO_INIT(THROTTLED_TIME, PERF_STATUS_THROTTLE_TIME_MASK, 0,
-               RAPL_DOMAIN_REG_PERF, TIME_UNIT, 0),
+       [POWER_LIMIT1]          = PRIMITIVE_INFO_INIT(POWER_LIMIT1, TPMI_POWER_LIMIT_MASK, 0,
+                                                     RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+       [POWER_LIMIT2]          = PRIMITIVE_INFO_INIT(POWER_LIMIT2, TPMI_POWER_LIMIT_MASK, 0,
+                                                     RAPL_DOMAIN_REG_PL2, POWER_UNIT, 0),
+       [POWER_LIMIT4]          = PRIMITIVE_INFO_INIT(POWER_LIMIT4, TPMI_POWER_LIMIT_MASK, 0,
+                                                     RAPL_DOMAIN_REG_PL4, POWER_UNIT, 0),
+       [ENERGY_COUNTER]        = PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,
+                                                     RAPL_DOMAIN_REG_STATUS, ENERGY_UNIT, 0),
+       [PL1_LOCK]              = PRIMITIVE_INFO_INIT(PL1_LOCK, POWER_HIGH_LOCK, 63,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL2_LOCK]              = PRIMITIVE_INFO_INIT(PL2_LOCK, POWER_HIGH_LOCK, 63,
+                                                     RAPL_DOMAIN_REG_PL2, ARBITRARY_UNIT, 0),
+       [PL4_LOCK]              = PRIMITIVE_INFO_INIT(PL4_LOCK, POWER_HIGH_LOCK, 63,
+                                                     RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),
+       [PL1_ENABLE]            = PRIMITIVE_INFO_INIT(PL1_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
+                                                     RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
+       [PL2_ENABLE]            = PRIMITIVE_INFO_INIT(PL2_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
+                                                     RAPL_DOMAIN_REG_PL2, ARBITRARY_UNIT, 0),
+       [PL4_ENABLE]            = PRIMITIVE_INFO_INIT(PL4_ENABLE, TPMI_POWER_LIMIT_ENABLE, 62,
+                                                     RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),
+       [TIME_WINDOW1]          = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TPMI_TIME_WINDOW_MASK, 18,
+                                                     RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
+       [TIME_WINDOW2]          = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TPMI_TIME_WINDOW_MASK, 18,
+                                                     RAPL_DOMAIN_REG_PL2, TIME_UNIT, 0),
+       [THERMAL_SPEC_POWER]    = PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER, TPMI_INFO_SPEC_MASK, 0,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MAX_POWER]             = PRIMITIVE_INFO_INIT(MAX_POWER, TPMI_INFO_MAX_MASK, 36,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MIN_POWER]             = PRIMITIVE_INFO_INIT(MIN_POWER, TPMI_INFO_MIN_MASK, 18,
+                                                     RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
+       [MAX_TIME_WINDOW]       = PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW, TPMI_INFO_MAX_TIME_WIN_MASK,
+                                                     54, RAPL_DOMAIN_REG_INFO, TIME_UNIT, 0),
+       [THROTTLED_TIME]        = PRIMITIVE_INFO_INIT(THROTTLED_TIME, PERF_STATUS_THROTTLE_TIME_MASK,
+                                                     0, RAPL_DOMAIN_REG_PERF, TIME_UNIT, 0),
        /* non-hardware */
-       [AVERAGE_POWER] = PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0,
-               POWER_UNIT, RAPL_PRIMITIVE_DERIVED),
+       [AVERAGE_POWER]         = PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0, POWER_UNIT,
+                                                     RAPL_PRIMITIVE_DERIVED),
 };
 
 static struct rapl_primitive_info *get_rpi(struct rapl_package *rp, int prim)
@@ -1143,14 +1160,6 @@ static u64 rapl_compute_time_window_atom(struct rapl_domain *rd, u64 value,
        return value;
 }
 
-/* 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  0x7C0
-#define TPMI_TIME_UNIT_OFFSET  0x0C
-#define TPMI_TIME_UNIT_MASK    0xF000
-
 static int rapl_check_unit_tpmi(struct rapl_domain *rd)
 {
        struct reg_action ra;
@@ -1241,77 +1250,77 @@ static const struct rapl_defaults rapl_defaults_amd = {
 };
 
 static const struct x86_cpu_id rapl_ids[] __initconst = {
-       X86_MATCH_VFM(INTEL_SANDYBRIDGE,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_SANDYBRIDGE_X,      &rapl_defaults_core),
-
-       X86_MATCH_VFM(INTEL_IVYBRIDGE,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_IVYBRIDGE_X,        &rapl_defaults_core),
-
-       X86_MATCH_VFM(INTEL_HASWELL,            &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_HASWELL_L,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_HASWELL_G,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_HASWELL_X,          &rapl_defaults_hsw_server),
-
-       X86_MATCH_VFM(INTEL_BROADWELL,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_BROADWELL_G,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_BROADWELL_D,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_BROADWELL_X,        &rapl_defaults_hsw_server),
-
-       X86_MATCH_VFM(INTEL_SKYLAKE,            &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_SKYLAKE_L,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_SKYLAKE_X,          &rapl_defaults_hsw_server),
-       X86_MATCH_VFM(INTEL_KABYLAKE_L,         &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_KABYLAKE,           &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_CANNONLAKE_L,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ICELAKE_L,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ICELAKE,            &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ICELAKE_NNPI,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ICELAKE_X,          &rapl_defaults_hsw_server),
-       X86_MATCH_VFM(INTEL_ICELAKE_D,          &rapl_defaults_hsw_server),
-       X86_MATCH_VFM(INTEL_COMETLAKE_L,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_COMETLAKE,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_TIGERLAKE_L,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_TIGERLAKE,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ROCKETLAKE,         &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ALDERLAKE,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ALDERLAKE_L,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,     &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_RAPTORLAKE,         &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_RAPTORLAKE_P,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_RAPTORLAKE_S,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_BARTLETTLAKE,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_METEORLAKE,         &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_METEORLAKE_L,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,   &rapl_defaults_spr_server),
-       X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,    &rapl_defaults_spr_server),
-       X86_MATCH_VFM(INTEL_LUNARLAKE_M,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_PANTHERLAKE_L,      &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_WILDCATLAKE_L,      &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_NOVALAKE,           &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_NOVALAKE_L,         &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ARROWLAKE_H,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ARROWLAKE,          &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ARROWLAKE_U,        &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_LAKEFIELD,          &rapl_defaults_core),
-
-       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT,    &rapl_defaults_byt),
-       X86_MATCH_VFM(INTEL_ATOM_AIRMONT,       &rapl_defaults_cht),
-       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &rapl_defaults_tng),
-       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID2,&rapl_defaults_ann),
-       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT,      &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D,    &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_TREMONT,       &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_TREMONT_D,     &rapl_defaults_core),
-       X86_MATCH_VFM(INTEL_ATOM_TREMONT_L,     &rapl_defaults_core),
-
-       X86_MATCH_VFM(INTEL_XEON_PHI_KNL,       &rapl_defaults_hsw_server),
-       X86_MATCH_VFM(INTEL_XEON_PHI_KNM,       &rapl_defaults_hsw_server),
-
-       X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd),
-       X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd),
-       X86_MATCH_VENDOR_FAM(AMD, 0x1A, &rapl_defaults_amd),
-       X86_MATCH_VENDOR_FAM(HYGON, 0x18, &rapl_defaults_amd),
+       X86_MATCH_VFM(INTEL_SANDYBRIDGE,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_SANDYBRIDGE_X,              &rapl_defaults_core),
+
+       X86_MATCH_VFM(INTEL_IVYBRIDGE,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_IVYBRIDGE_X,                &rapl_defaults_core),
+
+       X86_MATCH_VFM(INTEL_HASWELL,                    &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_HASWELL_L,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_HASWELL_G,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_HASWELL_X,                  &rapl_defaults_hsw_server),
+
+       X86_MATCH_VFM(INTEL_BROADWELL,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_BROADWELL_G,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_BROADWELL_D,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_BROADWELL_X,                &rapl_defaults_hsw_server),
+
+       X86_MATCH_VFM(INTEL_SKYLAKE,                    &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_SKYLAKE_L,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_SKYLAKE_X,                  &rapl_defaults_hsw_server),
+       X86_MATCH_VFM(INTEL_KABYLAKE_L,                 &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_KABYLAKE,                   &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_CANNONLAKE_L,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ICELAKE_L,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ICELAKE,                    &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ICELAKE_NNPI,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ICELAKE_X,                  &rapl_defaults_hsw_server),
+       X86_MATCH_VFM(INTEL_ICELAKE_D,                  &rapl_defaults_hsw_server),
+       X86_MATCH_VFM(INTEL_COMETLAKE_L,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_COMETLAKE,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_TIGERLAKE_L,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_TIGERLAKE,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ROCKETLAKE,                 &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ALDERLAKE,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ALDERLAKE_L,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,             &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE,                 &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_P,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_S,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_BARTLETTLAKE,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_METEORLAKE,                 &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_METEORLAKE_L,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,           &rapl_defaults_spr_server),
+       X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,            &rapl_defaults_spr_server),
+       X86_MATCH_VFM(INTEL_LUNARLAKE_M,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_PANTHERLAKE_L,              &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_WILDCATLAKE_L,              &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_NOVALAKE,                   &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_NOVALAKE_L,                 &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ARROWLAKE_H,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ARROWLAKE,                  &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ARROWLAKE_U,                &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_LAKEFIELD,                  &rapl_defaults_core),
+
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT,            &rapl_defaults_byt),
+       X86_MATCH_VFM(INTEL_ATOM_AIRMONT,               &rapl_defaults_cht),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID,        &rapl_defaults_tng),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID2,       &rapl_defaults_ann),
+       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT,              &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS,         &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D,            &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_TREMONT,               &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_TREMONT_D,             &rapl_defaults_core),
+       X86_MATCH_VFM(INTEL_ATOM_TREMONT_L,             &rapl_defaults_core),
+
+       X86_MATCH_VFM(INTEL_XEON_PHI_KNL,               &rapl_defaults_hsw_server),
+       X86_MATCH_VFM(INTEL_XEON_PHI_KNM,               &rapl_defaults_hsw_server),
+
+       X86_MATCH_VENDOR_FAM(AMD, 0x17,                 &rapl_defaults_amd),
+       X86_MATCH_VENDOR_FAM(AMD, 0x19,                 &rapl_defaults_amd),
+       X86_MATCH_VENDOR_FAM(AMD, 0x1A,                 &rapl_defaults_amd),
+       X86_MATCH_VENDOR_FAM(HYGON, 0x18,               &rapl_defaults_amd),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
@@ -1777,7 +1786,6 @@ enum perf_rapl_events {
        PERF_RAPL_PSYS,         /* psys */
        PERF_RAPL_MAX
 };
-#define RAPL_EVENT_MASK GENMASK(7, 0)
 
 static const int event_to_domain[PERF_RAPL_MAX] = {
        [PERF_RAPL_PP0]         = RAPL_DOMAIN_PP0,