Commit 234396ca authored by Zhang Rui's avatar Zhang Rui Committed by Xiaolong Wang
Browse files

powercap: intel_rapl: Allow probing without CPUID match 

mainline inclusion
from mainline-v6.5-rc1
commit 1488ac99
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I92135

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



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

Currently, CPU model checks is used to
1. get proper rapl_defaults callbacks for RAPL MSR/MMIO Interface.
2. create a platform device node for the intel_rapl_msr driver to probe.

Both of these are only mandatory for the RAPL MSR/MMIO Interface.

Make the CPUID match optional.

Intel-SIG: commit 1488ac99 powercap: intel_rapl: Allow probing without CPUID match
Backport Intel RAPL driver support on TPMI.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarWang Wendy <wendy.wang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Xiaolong Wang: amend commit log ]
Signed-off-by: default avatarXiaolong Wang <xiaolong.wang@intel.com>
parent 6b9a3aa3

drivers/powercap/intel_rapl_common.c

+14 −21
Original line number Diff line number Diff line
@@ -1512,32 +1512,25 @@ static int __init rapl_init(void) 
	int ret;



	id = x86_match_cpu(rapl_ids);

	if (!id) {

		pr_err("driver does not support CPU family %d model %d\n",

		       boot_cpu_data.x86, boot_cpu_data.x86_model);



		return -ENODEV;

	}



	if (id) {

		rapl_defaults = (struct rapl_defaults *)id->driver_data;



	ret = register_pm_notifier(&rapl_pm_notifier);

	if (ret)

		return ret;



		rapl_msr_platdev = platform_device_alloc("intel_rapl_msr", 0);

	if (!rapl_msr_platdev) {

		ret = -ENOMEM;

		goto end;

	}

		if (!rapl_msr_platdev)

			return -ENOMEM;



		ret = platform_device_add(rapl_msr_platdev);

	if (ret)

		if (ret) {

			platform_device_put(rapl_msr_platdev);

			return ret;

		}

	}



end:

	if (ret)

		unregister_pm_notifier(&rapl_pm_notifier);

	ret = register_pm_notifier(&rapl_pm_notifier);

	if (ret && rapl_msr_platdev) {

		platform_device_del(rapl_msr_platdev);

		platform_device_put(rapl_msr_platdev);

	}



	return ret;

}