Merge tag 'omap-for-v5.0/fixes-rc5' of... (410d7360) · Commits · 戴 / test

Merge tag 'omap-for-v5.0/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes Fix omap4 and later lost cpu1 interrupts for periodic timer A fix from Russell that took a while to get applied into fixes as I thought Russell is merging this one. * tag 'omap-for-v5.0/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug

arch/arm/mach-omap2/cpuidle44xx.c

+4 −12

Original line number	Diff line number	Diff line
		@@ -152,6 +152,10 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
		mpuss_can_lose_context = (cx->mpu_state == PWRDM_POWER_RET) &&
		(cx->mpu_logic_state == PWRDM_POWER_OFF);

		/* Enter broadcast mode for periodic timers */
		tick_broadcast_enable();

		/* Enter broadcast mode for one-shot timers */
		tick_broadcast_enter();

		/*
		@@ -218,15 +222,6 @@ fail:
		return index;
		}

		/*
		* For each cpu, setup the broadcast timer because local timers
		* stops for the states above C1.
		*/
		static void omap_setup_broadcast_timer(void *arg)
		{
		tick_broadcast_enable();
		}

		static struct cpuidle_driver omap4_idle_driver = {
		.name = "omap4_idle",
		.owner = THIS_MODULE,
		@@ -319,8 +314,5 @@ int __init omap4_idle_init(void)
		if (!cpu_clkdm[0] \|\| !cpu_clkdm[1])
		return -ENODEV;

		/* Configure the broadcast timer on each cpu */
		on_each_cpu(omap_setup_broadcast_timer, NULL, 1);

		return cpuidle_register(idle_driver, cpu_online_mask);
		}