Linus Walleij writes:
> This moves the clocksource_set_clock() and clockevent_set_clock()
> from the MIPS timer code into clockchips and clocksource where
> it belongs. The patch was triggered by code posted by Mikael
> Pettersson duplicating this code for the IOP ARM system. The
> function signatures where altered slightly to fit into their
> destination header files, unsigned int changed to u32 and inlined.
>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Mikael Pettersson <mikpe@xxxxxxxx>
> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> ---
> Ralf has stated in earlier conversation that this should be moved,
> now we risk duplicating code so let's move it.
>
> I don't have access to a MIPS cross-compiler so please can the
> MIPS people test this?
>
> Can you test it on the IOP too, Mikael?
Changing my ARM IOP clock code to use these now shared functions
was easy, and I get the same shift/mult values as I got before. So:
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
A few tiny comments about the patch follow below.
> --- a/include/linux/clockchips.h
> +++ b/include/linux/clockchips.h
> @@ -115,6 +115,30 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,
> return (unsigned long) tmp;
> }
>
> +/**
> + * clockevent_set_clock - dynamically calculates an appropriate shift
> + * and mult value for a clocksource given a
drop "dynamically"
"calculates appropriate shift and mult values" ?
s/clocksource/clockevent/
> + * known clock frequency
> + * @dev: Clockevent device to initialize
> + * @hz: Clockevent clock frequency in Hz
> + */
> +static inline void clockevent_set_clock(struct clock_event_device *dev, u32 hz)
> +{
> + u64 temp;
> + u32 shift;
> +
> + /* Find a shift value */
This comment is inaccurate. It should say "Find shift and mult values",
or you could remove it and rely on the comment above the function
definition to document the intended behaviour.
> + for (shift = 32; shift > 0; shift--) {
> + temp = (u64) hz << shift;
> + do_div(temp, NSEC_PER_SEC);
> + if ((temp >> 32) == 0)
> + break;
> + }
> + dev->shift = shift;
> + dev->mult = (u32) temp;
> +}
> +
> +
Two empty lines?
> /* Clock event layer functions */
> extern unsigned long clockevent_delta2ns(unsigned long latch,
> struct clock_event_device *evt);
> diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
> index 9ea40ff..807fb37 100644
> --- a/include/linux/clocksource.h
> +++ b/include/linux/clocksource.h
> @@ -257,6 +257,29 @@ static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
> }
>
> /**
> + * clocksource_set_clock - dynamically calculates an appropriate shift
> + * and mult value for a clocksource given a
drop "dynamically"
"calculates appropriate shift and mult values" ?
> + * known clock frequency
> + * @cs: Clocksource to initialize
> + * @hz: Clocksource frequency in Hz
> + */
> +static inline void clocksource_set_clock(struct clocksource *cs, u32 hz)
> +{
> + u64 temp;
> + u32 shift;
> +
> + /* Find a shift value */
Same issue as with the comment in clockevent_set_clock().
