| Message ID | ca4714d7b04c0c8b99194ccb8504610e67ba7d95.1434095303.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 15-06-15, 20:57, Stephen Warren wrote: > On 06/12/2015 02:00 AM, Viresh Kumar wrote: > > Migrate bcm2835 driver to the new 'set-state' interface provided by > > the clockevents core, the earlier 'set-mode' interface is marked > > obsolete now. > > > > This also enables us to implement callbacks for new states of clockevent > > devices, for example: ONESHOT_STOPPED. > > > > We weren't doing anything in the ->set_mode() callback. So, this patch > > doesn't provide any set-state callbacks. > > This generates a panic at boot (on top of 4.1.0-rc8+, which certainly at > least booted fine): > > > [ 0.008586] clocksource timer: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 1911260446275 ns > > [ 0.018080] ------------[ cut here ]------------ > > [ 0.022843] kernel BUG at kernel/time/clockevents.c:480! > > [ 0.028299] Internal error: Oops - BUG: 0 [#1] ARM > > [ 0.033237] CPU: 0 PID: 0 Comm: swapper Not tainted 4.1.0-rc8+ #46 > > [ 0.039567] Hardware name: BCM2835 > > [ 0.043092] task: c06fb648 ti: c06f6000 task.ti: c06f6000 > > [ 0.048668] PC is at clockevents_register_device+0x15c/0x174 This failed the sanity checks of clockevents core. Did you apply the first patch as well? Yes, its very much required. Also, there were dependencies on the latest tip, prepared for 4.2 merge window and would have been better if you tested on top of that. But those dependencies are for some helpers which aren't used in this patch. So, it might work over rc8 + the first patch from this series.. In case it doesn't, please test it over tip/master once.
On 15-06-15, 22:16, Stephen Warren wrote: > I see. You didn't Cc me on patch 1, and didn't mention the dependency in > this patch. That usually means they're all independent, e.g. the same > change in n different drivers. Yeah, I cc'd you on the cover-letter and missed it on the first patch. My fault. Actually during V1 the first patch wasn't there and so there was no dependency, but in V2 this patch came in and I completely forgot you and other guys for that patch. > Anyway, I tracked down the whole series and applied it on top of > next-20150615 and everything seems OK (kernel boots, and UART, USB kbd & > SD card work), so this patch, > Tested-by: Stephen Warren <swarren@wwwdotorg.org> Thanks a lot Stephen.
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index 26ed331b1aad..6f2822928963 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -54,21 +54,6 @@ static u64 notrace bcm2835_sched_read(void) return readl_relaxed(system_clock); } -static void bcm2835_time_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt_dev) -{ - switch (mode) { - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - break; - default: - WARN(1, "%s: unhandled event mode %d\n", __func__, mode); - break; - } -} - static int bcm2835_time_set_next_event(unsigned long event, struct clock_event_device *evt_dev) { @@ -129,7 +114,6 @@ static void __init bcm2835_timer_init(struct device_node *node) timer->evt.name = node->name; timer->evt.rating = 300; timer->evt.features = CLOCK_EVT_FEAT_ONESHOT; - timer->evt.set_mode = bcm2835_time_set_mode; timer->evt.set_next_event = bcm2835_time_set_next_event; timer->evt.cpumask = cpumask_of(0); timer->act.name = node->name;