Commit 85ce70fd authored by Linus Torvalds's avatar Linus Torvalds

Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus' of...

Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler and timer fixes from Ingo Molnar:
 "Contains a fix for a scheduler bug that manifested itself as a 3D
  performance regression and a crash fix for the ARM Cadence TTC clock
  driver"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Calculate effective load even if local weight is 0

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: cadence_ttc: Fix mutex taken inside interrupt context
...@@ -67,11 +67,13 @@ ...@@ -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,9 +198,8 @@ static void ttc_set_mode(enum clock_event_mode mode, ...@@ -196,9 +198,8 @@ 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:
case CLOCK_EVT_MODE_UNUSED: case CLOCK_EVT_MODE_UNUSED:
...@@ -273,6 +274,8 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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);
} }
/** /**
......
...@@ -3923,7 +3923,7 @@ static long effective_load(struct task_group *tg, int cpu, long wl, long wg) ...@@ -3923,7 +3923,7 @@ static long effective_load(struct task_group *tg, int cpu, long wl, long wg)
{ {
struct sched_entity *se = tg->se[cpu]; struct sched_entity *se = tg->se[cpu];
if (!tg->parent || !wl) /* the trivial, non-cgroup case */ if (!tg->parent) /* the trivial, non-cgroup case */
return wl; return wl;
for_each_sched_entity(se) { for_each_sched_entity(se) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment