Pull sony into release branch

[linux-2.6] / include / linux / clocksource.h

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index c4187cda0ee4dadfd0a5f49cc78fd894f59d6901..daa4940cc0f1fa37c9afd87b4ed759aac8c0a6bf 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -12,11 +12,13 @@
 #include <linux/timex.h>
 #include <linux/time.h>
 #include <linux/list.h>
+#include <linux/timer.h>
 #include <asm/div64.h>
 #include <asm/io.h>
 
 /* clocksource cycle base type */
 typedef u64 cycle_t;
+struct clocksource;
 
 /**
  * struct clocksource - hardware abstraction for a free running counter
@@ -44,10 +46,10 @@ typedef u64 cycle_t;
  *                     subtraction of non 64 bit counters
  * @mult:              cycle to nanosecond multiplier
  * @shift:             cycle to nanosecond divisor (power of two)
- * @update_callback:   called when safe to alter clocksource values
- * @is_continuous:     defines if clocksource is free-running.
- * @interval_cycles:   Used internally by timekeeping core, please ignore.
- * @interval_snsecs:   Used internally by timekeeping core, please ignore.
+ * @flags:             flags describing special properties
+ * @vread:             vsyscall based read
+ * @cycle_interval:    Used internally by timekeeping core, please ignore.
+ * @xtime_interval:    Used internally by timekeeping core, please ignore.
  */
 struct clocksource {
        char *name;
@@ -57,14 +59,32 @@ struct clocksource {
        cycle_t mask;
        u32 mult;
        u32 shift;
-       int (*update_callback)(void);
-       int is_continuous;
+       unsigned long flags;
+       cycle_t (*vread)(void);
 
        /* timekeeping specific data, ignore */
-       cycle_t interval_cycles;
-       u64 interval_snsecs;
+       cycle_t cycle_last, cycle_interval;
+       u64 xtime_nsec, xtime_interval;
+       s64 error;
+
+#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
+       /* Watchdog related data, used by the framework */
+       struct list_head wd_list;
+       cycle_t wd_last;
+#endif
 };
 
+/*
+ * Clock source flags bits::
+ */
+#define CLOCK_SOURCE_IS_CONTINUOUS             0x01
+#define CLOCK_SOURCE_MUST_VERIFY               0x02
+
+#define CLOCK_SOURCE_WATCHDOG                  0x10
+#define CLOCK_SOURCE_VALID_FOR_HRES            0x20
+
+/* simplify initialization of mask field */
+#define CLOCKSOURCE_MASK(bits) (cycle_t)(bits<64 ? ((1ULL<<bits)-1) : -1)
 
 /**
  * clocksource_khz2mult - calculates mult from khz and shift
@@ -118,12 +138,12 @@ static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
 }
 
 /**
- * read_clocksource: - Access the clocksource's current cycle value
+ * clocksource_read: - Access the clocksource's current cycle value
  * @cs:                pointer to clocksource being read
  *
  * Uses the clocksource to return the current cycle_t value
  */
-static inline cycle_t read_clocksource(struct clocksource *cs)
+static inline cycle_t clocksource_read(struct clocksource *cs)
 {
        return cs->read();
 }
@@ -145,7 +165,7 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
 }
 
 /**
- * calculate_clocksource_interval - Calculates a clocksource interval struct
+ * clocksource_calculate_interval - Calculates a clocksource interval struct
  *
  * @c:         Pointer to clocksource.
  * @length_nsec: Desired interval length in nanoseconds.
@@ -155,8 +175,8 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
  *
  * Unless you're the timekeeping code, you should not be using this!
  */
-static inline void calculate_clocksource_interval(struct clocksource *c,
-                                               unsigned long length_nsec)
+static inline void clocksource_calculate_interval(struct clocksource *c,
+                                                 unsigned long length_nsec)
 {
        u64 tmp;
 
@@ -166,16 +186,25 @@ static inline void calculate_clocksource_interval(struct clocksource *c,
        tmp += c->mult/2;
        do_div(tmp, c->mult);
 
-       c->interval_cycles = (cycle_t)tmp;
-       if(c->interval_cycles == 0)
-               c->interval_cycles = 1;
+       c->cycle_interval = (cycle_t)tmp;
+       if (c->cycle_interval == 0)
+               c->cycle_interval = 1;
 
-       c->interval_snsecs = (u64)c->interval_cycles * c->mult;
+       c->xtime_interval = (u64)c->cycle_interval * c->mult;
 }
 
+
 /* used to install a new clocksource */
-int register_clocksource(struct clocksource*);
-void reselect_clocksource(void);
-struct clocksource* get_next_clocksource(void);
+extern int clocksource_register(struct clocksource*);
+extern struct clocksource* clocksource_get_next(void);
+extern void clocksource_change_rating(struct clocksource *cs, int rating);
+
+#ifdef CONFIG_GENERIC_TIME_VSYSCALL
+extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
+#else
+static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
+{
+}
+#endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */