drivers/idle: make intel_idle.c driver more explicitly non-modular (02c4fae9) · Commits · 戴 / test

The Kconfig for this driver is currently declared with: config INTEL_IDLE bool "Cpuidle Driver for Intel Processors" ...meaning that it currently is not being built as a module by anyone. This was done in commit ("intel_idle: disable module support") since "...the module capability is cauing more trouble than it is worth." This was done over 5y ago, and Daniel adds that: ...the modular support has been removed from almost all the cpuidle drivers and the cpuidle framework is no longer assuming driver could be unloaded. Removing the modular dead code in the driver makes sense as this what have been done in the others drivers. So lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. At a later date we might want to consider whether subsys_init or another init category seems more appropriate than device_init. We replace module.h with moduleparam.h since the file does declare some module parameters, and leaving them as such is currently the easiest way to remain compatible with existing boot arg use cases. Note that MODULE_DEVICE_TABLE is a no-op for non-modular code. Also note that we can't remove intel_idle_cpuidle_devices_uninit() as that is still used for unwind purposes if the init fails. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by:

Len Brown <len.brown@intel.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/idle/intel_idle.c

+8 −33

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@
		* to avoid complications with the lapic timer workaround.
		* Have not seen issues with suspend, but may need same workaround here.
		*
		* There is currently no kernel-based automatic probing/loading mechanism
		* if the driver is built as a module.
		*/

		/* un-comment DEBUG to enable pr_debug() statements */
		@@ -60,7 +58,7 @@
		#include <linux/sched.h>
		#include <linux/notifier.h>
		#include <linux/cpu.h>
		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <asm/cpu_device_id.h>
		#include <asm/intel-family.h>
		#include <asm/mwait.h>
		@@ -1055,7 +1053,6 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
		ICPU(INTEL_FAM6_ATOM_GOLDMONT, idle_cpu_bxt),
		{}
		};
		MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);

		/*
		* intel_idle_probe()
		@@ -1416,34 +1413,12 @@ static int __init intel_idle_init(void)

		return 0;
		}
		device_initcall(intel_idle_init);

		static void __exit intel_idle_exit(void)
		{
		struct cpuidle_device *dev;
		int i;

		cpu_notifier_register_begin();

		if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE)
		on_each_cpu(__setup_broadcast_timer, (void *)false, 1);
		__unregister_cpu_notifier(&cpu_hotplug_notifier);

		for_each_possible_cpu(i) {
		dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
		cpuidle_unregister_device(dev);
		}

		cpu_notifier_register_done();

		cpuidle_unregister_driver(&intel_idle_driver);
		free_percpu(intel_idle_cpuidle_devices);
		}

		module_init(intel_idle_init);
		module_exit(intel_idle_exit);

		/*
		* We are not really modular, but we used to support that. Meaning we also
		* support "intel_idle.max_cstate=..." at boot and also a read-only export of
		* it at /sys/module/intel_idle/parameters/max_cstate -- so using module_param
		* is the easiest way (currently) to continue doing that.
		*/
		module_param(max_cstate, int, 0444);

		MODULE_AUTHOR("Len Brown <len.brown@intel.com>");
		MODULE_DESCRIPTION("Cpuidle driver for Intel Hardware v" INTEL_IDLE_VERSION);
		MODULE_LICENSE("GPL");

Admin message