Commit 89bb573d authored by Zhang Rui's avatar Zhang Rui Committed by Yunying Sun
Browse files

powercap: intel_rapl_tpmi: Enable PMU support 

mainline inclusion
from mainline-v6.10-rc1
commit 963a9ad3c589dc0f922697faea53c69098083945
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9TD3P
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=963a9ad3c589dc0f922697faea53c69098083945



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

Enable RAPL PMU support for TPMI RAPL driver.

Intel-SIG: commit 963a9ad3c589 powercap: intel_rapl_tpmi: Enable PMU support
Backport TPMI based RAPL PMU support for GNR and future Xeons.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarYunying Sun <yunying.sun@intel.com>
parent b50c2041

drivers/powercap/intel_rapl_tpmi.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

}