Commit 7b732169 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fixes from Thomas Gleixner:
 "This update from the timer departement contains:

   - A series of patches which address a shortcoming in the tick
     broadcast code.

     If the broadcast device is not available or an hrtimer emulated
     broadcast device, some of the original assumptions lead to boot
     failures.  I rather plugged all of the corner cases instead of only
     addressing the issue reported, so the change got a little larger.

     Has been extensivly tested on x86 and arm.

   - Get rid of the last holdouts using do_posix_clock_monotonic_gettime()

   - A regression fix for the imx clocksource driver

   - An update to the new state callbacks mechanism for clockevents.
     This is required to simplify the conversion, which will take place
     in 4.3"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick/broadcast: Prevent NULL pointer dereference
  time: Get rid of do_posix_clock_monotonic_gettime
  cris: Replace do_posix_clock_monotonic_gettime()
  tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
  tick/broadcast: Handle spurious interrupts gracefully
  tick/broadcast: Check for hrtimer broadcast active early
  tick/broadcast: Return busy when IPI is pending
  tick/broadcast: Return busy if periodic mode and hrtimer broadcast
  tick/broadcast: Move the check for periodic mode inside state handling
  tick/broadcast: Prevent deep idle if no broadcast device available
  tick/broadcast: Make idle check independent from mode and config
  tick/broadcast: Sanity check the shutdown of the local clock_event
  tick/broadcast: Prevent hrtimer recursion
  clockevents: Allow set-state callbacks to be optional
  clocksource/imx: Define clocksource for mx27
parents c4bc680c c4d029f2

arch/cris/arch-v32/drivers/sync_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static inline void handle_rx_packet(struct sync_port *port) 
		if (port->write_ts_idx == NBR_IN_DESCR)

			port->write_ts_idx = 0;

		idx = port->write_ts_idx++;

		do_posix_clock_monotonic_gettime(&port->timestamp[idx]);

		ktime_get_ts(&port->timestamp[idx]);

		port->in_buffer_len += port->inbufchunk;

	}

	spin_unlock_irqrestore(&port->lock, flags);

drivers/clocksource/timer-imx-gpt.c

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ static void __init imx6dl_timer_init_dt(struct device_node *np) 


CLOCKSOURCE_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt);

CLOCKSOURCE_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt);

CLOCKSOURCE_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt);

CLOCKSOURCE_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt);

CLOCKSOURCE_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt);

CLOCKSOURCE_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt);

include/linux/tick.h

+5 −2
Original line number Diff line number Diff line
@@ -67,10 +67,13 @@ extern void tick_broadcast_control(enum tick_broadcast_mode mode); 
static inline void tick_broadcast_control(enum tick_broadcast_mode mode) { }

#endif /* BROADCAST */



#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)

#ifdef CONFIG_GENERIC_CLOCKEVENTS

extern int tick_broadcast_oneshot_control(enum tick_broadcast_state state);

#else

static inline int tick_broadcast_oneshot_control(enum tick_broadcast_state state) { return 0; }

static inline int tick_broadcast_oneshot_control(enum tick_broadcast_state state)

{

	return 0;

}

#endif



static inline void tick_broadcast_enable(void)

include/linux/timekeeping.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static inline void getboottime(struct timespec *ts) 
}

#endif



#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)

#define ktime_get_real_ts64(ts)	getnstimeofday64(ts)



/*

kernel/time/clockevents.c

+9 −15
Original line number Diff line number Diff line
@@ -120,19 +120,25 @@ static int __clockevents_switch_state(struct clock_event_device *dev, 
		/* The clockevent device is getting replaced. Shut it down. */



	case CLOCK_EVT_STATE_SHUTDOWN:

		if (dev->set_state_shutdown)

			return dev->set_state_shutdown(dev);

		return 0;



	case CLOCK_EVT_STATE_PERIODIC:

		/* Core internal bug */

		if (!(dev->features & CLOCK_EVT_FEAT_PERIODIC))

			return -ENOSYS;

		if (dev->set_state_periodic)

			return dev->set_state_periodic(dev);

		return 0;



	case CLOCK_EVT_STATE_ONESHOT:

		/* Core internal bug */

		if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT))

			return -ENOSYS;

		if (dev->set_state_oneshot)

			return dev->set_state_oneshot(dev);

		return 0;



	case CLOCK_EVT_STATE_ONESHOT_STOPPED:

		/* Core internal bug */
@@ -471,18 +477,6 @@ static int clockevents_sanity_check(struct clock_event_device *dev) 
	if (dev->features & CLOCK_EVT_FEAT_DUMMY)

		return 0;



	/* New state-specific callbacks */

	if (!dev->set_state_shutdown)

		return -EINVAL;



	if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) &&

	    !dev->set_state_periodic)

		return -EINVAL;



	if ((dev->features & CLOCK_EVT_FEAT_ONESHOT) &&

	    !dev->set_state_oneshot)

		return -EINVAL;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE