powercap: intel_rapl_tpmi: Enable PMU support

darcari · darcari · commit 99cdbc6773ba · 2024-08-29T10:18:33.000-04:00
JIRA: https://issues.redhat.com/browse/RHEL-53594 commit 963a9ad Author: Zhang Rui <rui.zhang@intel.com> Date: Sun Apr 28 17:24:27 2024 +0800 powercap: intel_rapl_tpmi: Enable PMU support Enable RAPL PMU support for TPMI RAPL driver. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: David Arcari <darcari@redhat.com>
diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
@@ -302,6 +302,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;
@@ -314,6 +316,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
`@@ -302,6 +302,8 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,`
`302`	`302`	`goto err;`
`303`	`303`	`}`
`304`	`304`
	`305`	`+ rapl_package_add_pmu(trp->rp);`
	`306`	`+`
`305`	`307`	`auxiliary_set_drvdata(auxdev, trp);`
`306`	`308`
`307`	`309`	`return 0;`
`@@ -314,6 +316,7 @@ static void intel_rapl_tpmi_remove(struct auxiliary_device *auxdev)`
`314`	`316`	`{`
`315`	`317`	`struct tpmi_rapl_package *trp = auxiliary_get_drvdata(auxdev);`
`316`	`318`
	`319`	`+ rapl_package_remove_pmu(trp->rp);`
`317`	`320`	`rapl_remove_package(trp->rp);`
`318`	`321`	`trp_release(trp);`
`319`	`322`	`}`