Commit 651fc862 authored by Zhang Rui's avatar Zhang Rui Committed by Wang, Xiaolong
Browse files

powercap: intel_rapl_tpmi: Fix a register bug

mainline inclusion
from mainline-v6.9-rc1
commit faa9130ce716b286d786d59032bacfd9052c2094
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IA85P6
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=faa9130ce716b286d786d59032bacfd9052c2094



--------------------------------

Add the missing Domain Info register. This also fixes the bogus
definition of the Interrupt register.

Neither of these two registers was used previously.

Intel-SIG: commit faa9130ce716 powercap: intel_rapl_tpmi: Fix a register bug
Backport Intel RAPL driver bugfixes up to upstream v6.9.

Fixes: 9eef7f9d ("powercap: intel_rapl: Introduce RAPL TPMI interface driver")
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Cc: 6.5+ <stable@vger.kernel.org> # 6.5+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Xiaolong Wang: amend commit log ]
Signed-off-by: default avatarXiaolong Wang <xiaolong.wang@intel.com>
parent b49e4969
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ enum tpmi_rapl_register {
	TPMI_RAPL_REG_ENERGY_STATUS,
	TPMI_RAPL_REG_ENERGY_STATUS,
	TPMI_RAPL_REG_PERF_STATUS,
	TPMI_RAPL_REG_PERF_STATUS,
	TPMI_RAPL_REG_POWER_INFO,
	TPMI_RAPL_REG_POWER_INFO,
	TPMI_RAPL_REG_DOMAIN_INFO,
	TPMI_RAPL_REG_INTERRUPT,
	TPMI_RAPL_REG_INTERRUPT,
	TPMI_RAPL_REG_MAX = 15,
	TPMI_RAPL_REG_MAX = 15,
};
};