Commit 045610c3 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

powercap: intel_rapl: Change primitive order 



The same set of operations are shared by different Powert Limits,
including Power Limit get/set, Power Limit enable/disable, clamping
enable/disable, time window get/set, and max power get/set, etc.

But the same operation for different Power Limit has different
primitives because they use different registers/register bits.

A lot of dirty/duplicate code was introduced to handle this difference.

Instead of using hardcoded primitive name directly, using Power Limit id
+ operation type is much cleaner.

For this sense, move POWER_LIMIT1/POWER_LIMIT2/POWER_LIMIT4 to the
beginning of enum rapl_primitives so that they can be reused as
Power Limit ids.

No functional change.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarWang Wendy <wendy.wang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 11edbe5c

drivers/powercap/intel_rapl_common.c

+2 −2
Original line number Diff line number Diff line
@@ -631,14 +631,14 @@ static u64 rapl_unit_xlate(struct rapl_domain *rd, enum unit_type type, 


static struct rapl_primitive_info rpi_default[NR_RAPL_PRIMITIVES] = {

	/* name, mask, shift, msr index, unit divisor */

	[ENERGY_COUNTER] = PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,

			    RAPL_DOMAIN_REG_STATUS, ENERGY_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),

	[PL1_ENABLE] = PRIMITIVE_INFO_INIT(PL1_ENABLE, POWER_LIMIT1_ENABLE, 15,

include/linux/intel_rapl.h

+3 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ enum rapl_domain_reg_id { 
struct rapl_domain;



enum rapl_primitives {

	ENERGY_COUNTER,

	POWER_LIMIT1,

	POWER_LIMIT2,

	POWER_LIMIT4,

	ENERGY_COUNTER,

	FW_LOCK,



	PL1_ENABLE,		/* power limit 1, aka long term */
@@ -75,7 +75,8 @@ struct rapl_domain_data { 
	unsigned long timestamp;

};



#define NR_POWER_LIMITS (3)

#define NR_POWER_LIMITS	(POWER_LIMIT4 + 1)



struct rapl_power_limit {

	struct powercap_zone_constraint *constraint;

	int prim_id;		/* primitive ID used to enable */