Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76cb066 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

powercap: Invoke powercap_init() and rapl_init() earlier 



The MMIO RAPL interface driver depends on both powercap subsystem and
the intel_rapl_common code.

But when all of them are built-in, the MMIO RAPL interface driver can
be loaded before the other two and this breaks the system during boot.

Fix this by adjusting the init order of the powercap subsystem and the
intel_rapl_common code, so that it can be initialized first.

Fixes: 555c45fe ("int340X/processor_thermal_device: add support for MMIO RAPL")
Reported-by: default avatarKenneth R. Crudup <kenny@panix.com>
Tested-by: default avatarKenneth R. Crudup <kenny@panix.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
[ rjw: Subject & changelog ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5f9e832c

drivers/powercap/intel_rapl_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ static void __exit rapl_exit(void) 
	unregister_pm_notifier(&rapl_pm_notifier);

}



module_init(rapl_init);

fs_initcall(rapl_init);

module_exit(rapl_exit);



MODULE_DESCRIPTION("Intel Runtime Average Power Limit (RAPL) common code");

drivers/powercap/powercap_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int __init powercap_init(void) 
	return class_register(&powercap_class);

}



device_initcall(powercap_init);

fs_initcall(powercap_init);



MODULE_DESCRIPTION("PowerCap sysfs Driver");

MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");