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

Commit e59da0ae authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'clockevents/3.13-fixes' of... 

Merge branch 'clockevents/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux

 into timers/urgent

Pull clock driver fix from Daniel Lezcano:

 " * Soren Brinkmann fixed the cadence_ttc driver where a call to
     clk_get_rate happens in an interrupt context. More precisely in an IPI
     when the broadcast timer is initialized for each cpu in the cpuidle
     driver. "

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a6da83f9 c1dcc927

drivers/clocksource/cadence_ttc_timer.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -67,11 +67,13 @@ 
 * struct ttc_timer - This definition defines local timer structure

 * struct ttc_timer - This definition defines local timer structure

 *

 *

 * @base_addr:	Base address of timer

 * @base_addr:	Base address of timer

 * @freq:	Timer input clock frequency

 * @clk:	Associated clock source

 * @clk:	Associated clock source

 * @clk_rate_change_nb	Notifier block for clock rate changes

 * @clk_rate_change_nb	Notifier block for clock rate changes

 */

 */

struct ttc_timer {

struct ttc_timer {

	void __iomem *base_addr;

	void __iomem *base_addr;

	unsigned long freq;

	struct clk *clk;

	struct clk *clk;

	struct notifier_block clk_rate_change_nb;

	struct notifier_block clk_rate_change_nb;

};

};
@@ -196,8 +198,7 @@ static void ttc_set_mode(enum clock_event_mode mode, 




	switch (mode) {

	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

	case CLOCK_EVT_MODE_PERIODIC:

		ttc_set_interval(timer,

		ttc_set_interval(timer, DIV_ROUND_CLOSEST(ttce->ttc.freq,

				DIV_ROUND_CLOSEST(clk_get_rate(ttce->ttc.clk),

						PRESCALE * HZ));

						PRESCALE * HZ));

		break;

		break;

	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_ONESHOT:
@@ -273,6 +274,8 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) 
		return;

		return;

	}

	}





	ttccs->ttc.freq = clk_get_rate(ttccs->ttc.clk);



	ttccs->ttc.clk_rate_change_nb.notifier_call =

	ttccs->ttc.clk_rate_change_nb.notifier_call =

		ttc_rate_change_clocksource_cb;

		ttc_rate_change_clocksource_cb;

	ttccs->ttc.clk_rate_change_nb.next = NULL;

	ttccs->ttc.clk_rate_change_nb.next = NULL;
@@ -298,16 +301,14 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) 
	__raw_writel(CNT_CNTRL_RESET,

	__raw_writel(CNT_CNTRL_RESET,

		     ttccs->ttc.base_addr + TTC_CNT_CNTRL_OFFSET);

		     ttccs->ttc.base_addr + TTC_CNT_CNTRL_OFFSET);





	err = clocksource_register_hz(&ttccs->cs,

	err = clocksource_register_hz(&ttccs->cs, ttccs->ttc.freq / PRESCALE);

			clk_get_rate(ttccs->ttc.clk) / PRESCALE);

	if (WARN_ON(err)) {

	if (WARN_ON(err)) {

		kfree(ttccs);

		kfree(ttccs);

		return;

		return;

	}

	}





	ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;

	ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;

	setup_sched_clock(ttc_sched_clock_read, 16,

	setup_sched_clock(ttc_sched_clock_read, 16, ttccs->ttc.freq / PRESCALE);

			clk_get_rate(ttccs->ttc.clk) / PRESCALE);

}

}





static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,

static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
@@ -334,6 +335,9 @@ static int ttc_rate_change_clockevent_cb(struct notifier_block *nb, 
				ndata->new_rate / PRESCALE);

				ndata->new_rate / PRESCALE);

		local_irq_restore(flags);

		local_irq_restore(flags);





		/* update cached frequency */

		ttc->freq = ndata->new_rate;



		/* fall through */

		/* fall through */

	}

	}

	case PRE_RATE_CHANGE:

	case PRE_RATE_CHANGE:
@@ -367,6 +371,7 @@ static void __init ttc_setup_clockevent(struct clk *clk, 
	if (clk_notifier_register(ttcce->ttc.clk,

	if (clk_notifier_register(ttcce->ttc.clk,

				&ttcce->ttc.clk_rate_change_nb))

				&ttcce->ttc.clk_rate_change_nb))

		pr_warn("Unable to register clock notifier.\n");

		pr_warn("Unable to register clock notifier.\n");

	ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);





	ttcce->ttc.base_addr = base;

	ttcce->ttc.base_addr = base;

	ttcce->ce.name = "ttc_clockevent";

	ttcce->ce.name = "ttc_clockevent";
@@ -396,7 +401,7 @@ static void __init ttc_setup_clockevent(struct clk *clk, 
	}

	}





	clockevents_config_and_register(&ttcce->ce,

	clockevents_config_and_register(&ttcce->ce,

			clk_get_rate(ttcce->ttc.clk) / PRESCALE, 1, 0xfffe);

			ttcce->ttc.freq / PRESCALE, 1, 0xfffe);

}

}





/**

/**