Commit 8b693b62 authored by Zhang Rui's avatar Zhang Rui Committed by Wen Zhiwei
Browse files

powercap: intel_rapl_tpmi: Fix bogus register reading 

stable inclusion
from stable-v6.6.57
commit bd3222d47faeffaa1a2d1830a811fc9ea3fbf552
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bd3222d47faeffaa1a2d1830a811fc9ea3fbf552



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

commit 91e8f835a7eda4ba2c0c4002a3108a0e3b22d34e upstream.

The TPMI_RAPL_REG_DOMAIN_INFO value needs to be multiplied by 8 to get
the register offset.

Cc: All applicable <stable@vger.kernel.org>
Fixes: 903eb9fb85e3 ("powercap: intel_rapl_tpmi: Fix System Domain probing")
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Link: https://patch.msgid.link/20240930081801.28502-2-rui.zhang@intel.com


[ rjw: Changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent dd2d2ac6

drivers/powercap/intel_rapl_tpmi.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset) 
			pr_warn(FW_BUG "System domain must support Domain Info register\n");

			return -ENODEV;

		}

		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO);

		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO * 8);

		if (!(tpmi_domain_info & TPMI_RAPL_DOMAIN_ROOT))

			return 0;

		domain_type = RAPL_DOMAIN_PLATFORM;