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

powercap: intel_rapl: Remove unused AVERAGE_POWER primitive 



The AVERAGE_POWER primitive and RAPL_PRIMITIVE_DERIVED flag are not
used anywhere in the code.

Remove them to simplify the primitive handling logic.

No functional changes.

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/20260313185333.2370733-2-sathyanarayanan.kuppuswamy@linux.intel.com


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

drivers/powercap/intel_rapl_common.c

+0 −13
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define TPMI_INFO_MAX_TIME_WIN_MASK	GENMASK_ULL(60, 54)



/* Non HW constants */

#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 */
@@ -703,9 +702,6 @@ static struct rapl_primitive_info rpi_msr[NR_RAPL_PRIMITIVES] = { 
						      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),

};



/* RAPL primitives for TPMI I/F */
@@ -745,9 +741,6 @@ static struct rapl_primitive_info rpi_tpmi[NR_RAPL_PRIMITIVES] = { 
						      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),

};



static struct rapl_primitive_info *get_rpi(struct rapl_package *rp, int prim)
@@ -841,12 +834,6 @@ static int rapl_read_data_raw(struct rapl_domain *rd, 
	if (!ra.reg.val)

		return -EINVAL;



	/* non-hardware data are collected by the polling thread */

	if (rpi->flag & RAPL_PRIMITIVE_DERIVED) {

		*data = rd->rdd.primitives[prim];

		return 0;

	}



	ra.mask = rpi->mask;



	if (rd->rp->priv->read_raw(get_rid(rd->rp), &ra, pmu_ctx)) {

include/linux/intel_rapl.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ enum rapl_primitives { 
	PSYS_TIME_WINDOW1,

	PSYS_TIME_WINDOW2,

	/* below are not raw primitive data */

	AVERAGE_POWER,

	NR_RAPL_PRIMITIVES,

};