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

Commit 2259a819 authored by Richard Cochran's avatar Richard Cochran Committed by Rafael J. Wysocki
Browse files

intel_idle: Setup the timer broadcast only on successful driver load. 



This driver sets the broadcast tick quite early on during probe and does
not clean up again in cast of failure.  This patch moves the setup call
after the registration, placing the on_each_cpu() calls within the global
CPU lock region.

Signed-off-by: default avatarRichard Cochran <rcochran@linutronix.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ca42489d

drivers/idle/intel_idle.c

+8 −7
Original line number Diff line number Diff line
@@ -987,16 +987,9 @@ static int __init intel_idle_probe(void) 
	icpu = (const struct idle_cpu *)id->driver_data;

	cpuidle_state_table = icpu->state_table;



	if (boot_cpu_has(X86_FEATURE_ARAT))	/* Always Reliable APIC Timer */

		lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;

	else

		on_each_cpu(__setup_broadcast_timer, (void *)true, 1);



	pr_debug(PREFIX "v" INTEL_IDLE_VERSION

		" model 0x%X\n", boot_cpu_data.x86_model);



	pr_debug(PREFIX "lapic_timer_reliable_states 0x%x\n",

		lapic_timer_reliable_states);

	return 0;

}
@@ -1234,8 +1227,16 @@ static int __init intel_idle_init(void) 
	}

	__register_cpu_notifier(&cpu_hotplug_notifier);



	if (boot_cpu_has(X86_FEATURE_ARAT))	/* Always Reliable APIC Timer */

		lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;

	else

		on_each_cpu(__setup_broadcast_timer, (void *)true, 1);



	cpu_notifier_register_done();



	pr_debug(PREFIX "lapic_timer_reliable_states 0x%x\n",

		lapic_timer_reliable_states);



	return 0;

}