powercap: intel_rapl_tpmi: Enable PMU support

zhang-rui · opsiff · commit c85b8c8e1c19 · 2025-06-03T10:36:56.000+08:00
ANBZ: #9256 commit 963a9ad upstream. Enable RAPL PMU support for TPMI RAPL driver. Intel-SIG: commit 963a9ad powercap: intel_rapl_tpmi: Enable PMU support Backport TPMI based RAPL PMU support for GNR and future Xeons. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> [ Yunying Sun: amend commit log ] Signed-off-by: Yunying Sun <yunying.sun@intel.com>
diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
@@ -313,6 +313,8 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,
 		goto err;
 	}
 
+	rapl_package_add_pmu(trp->rp);
+
 	auxiliary_set_drvdata(auxdev, trp);
 
 	return 0;
@@ -325,6 +327,7 @@ static void intel_rapl_tpmi_remove(struct auxiliary_device *auxdev)
 {
 	struct tpmi_rapl_package *trp = auxiliary_get_drvdata(auxdev);
 
+	rapl_package_remove_pmu(trp->rp);
 	rapl_remove_package(trp->rp);
 	trp_release(trp);
 }

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,`
`313`	`313`	`goto err;`
`314`	`314`	`}`
`315`	`315`
	`316`	`+ rapl_package_add_pmu(trp->rp);`
	`317`	`+`
`316`	`318`	`auxiliary_set_drvdata(auxdev, trp);`
`317`	`319`
`318`	`320`	`return 0;`
`@@ -325,6 +327,7 @@ static void intel_rapl_tpmi_remove(struct auxiliary_device *auxdev)`
`325`	`327`	`{`
`326`	`328`	`struct tpmi_rapl_package *trp = auxiliary_get_drvdata(auxdev);`
`327`	`329`
	`330`	`+ rapl_package_remove_pmu(trp->rp);`
`328`	`331`	`rapl_remove_package(trp->rp);`
`329`	`332`	`trp_release(trp);`
`330`	`333`	`}`