]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
powercap: intel_rapl_tpmi: Fix bogus register reading
authorZhang Rui <rui.zhang@intel.com>
Mon, 30 Sep 2024 08:17:56 +0000 (16:17 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 7 Oct 2024 18:10:56 +0000 (20:10 +0200)
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: Zhang Rui <rui.zhang@intel.com>
Link: https://patch.msgid.link/20240930081801.28502-2-rui.zhang@intel.com
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/powercap/intel_rapl_tpmi.c

index 947544e4d229aa963ea22a04a4c3e2a6a4e62961..7435df083ea42f0870ef80253cf5d992d4074d3d 100644 (file)
@@ -181,7 +181,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;