powercap: intel_rapl_tpmi: Fix bogus register reading

zhang-rui · gregkh · commit b3f07ad47904 · 2024-10-17T15:27:01.000+02:00
commit 91e8f83 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: 903eb9f ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)`
`192`	`192`	`pr_warn(FW_BUG "System domain must support Domain Info register\n");`
`193`	`193`	`return -ENODEV;`
`194`	`194`	`}`
`195`		`- tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO);`
	`195`	`+ tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO * 8);`
`196`	`196`	`if (!(tpmi_domain_info & TPMI_RAPL_DOMAIN_ROOT))`
`197`	`197`	`return 0;`
`198`	`198`	`domain_type = RAPL_DOMAIN_PLATFORM;`