[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel

This patch moves the vdso's to arch/powerpc, adds support for the 32
bits vdso to the 32 bits kernel, rename systemcfg (finally !), and adds
some new (still untested) routines to both vdso's: clock_gettime() with
support for CLOCK_REALTIME and CLOCK_MONOTONIC, clock_getres() (same
clocks) and get_tbfreq() for glibc to retreive the timebase frequency.

Tom,Steve: The implementation of get_tbfreq() I've done for 32 bits
returns a long long (r3, r4) not a long. This is such that if we ever
add support for >4Ghz timebases on ppc32, the userland interface won't
have to change.

I have tested gettimeofday() using some glibc patches in both ppc32 and
ppc64 kernels using 32 bits userland (I haven't had a chance to test a
64 bits userland yet, but the implementation didn't change and was
tested earlier). I haven't tested yet the new functions.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 31 insertions, 14 deletions

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 8793102711a8..4550eb4f4fbd 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -37,12 +37,12 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/rtas.h>
+#include <asm/vdso_datapage.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/lppaca.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/cache.h>
-#include <asm/systemcfg.h>
 #include <asm/compat.h>
 #endif
 
@@ -251,25 +251,42 @@ int main(void)
 
         DEFINE(TASK_SIZE, TASK_SIZE);
         DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28);
-#else /* CONFIG_PPC64 */
-        /* systemcfg offsets for use by vdso */
-        DEFINE(CFG_TB_ORIG_STAMP, offsetof(struct systemcfg, tb_orig_stamp));
-        DEFINE(CFG_TB_TICKS_PER_SEC, offsetof(struct systemcfg, tb_ticks_per_sec));
-        DEFINE(CFG_TB_TO_XS, offsetof(struct systemcfg, tb_to_xs));
-        DEFINE(CFG_STAMP_XSEC, offsetof(struct systemcfg, stamp_xsec));
-        DEFINE(CFG_TB_UPDATE_COUNT, offsetof(struct systemcfg, tb_update_count));
-        DEFINE(CFG_TZ_MINUTEWEST, offsetof(struct systemcfg, tz_minuteswest));
-        DEFINE(CFG_TZ_DSTTIME, offsetof(struct systemcfg, tz_dsttime));
-        DEFINE(CFG_SYSCALL_MAP32, offsetof(struct systemcfg, syscall_map_32));
-        DEFINE(CFG_SYSCALL_MAP64, offsetof(struct systemcfg, syscall_map_64));
+#endif /* ! CONFIG_PPC64 */
 
-        /* timeval/timezone offsets for use by vdso */
+        /* datapage offsets for use by vdso */
+        DEFINE(CFG_TB_ORIG_STAMP, offsetof(struct vdso_data, tb_orig_stamp));
+        DEFINE(CFG_TB_TICKS_PER_SEC, offsetof(struct vdso_data, tb_ticks_per_sec));
+        DEFINE(CFG_TB_TO_XS, offsetof(struct vdso_data, tb_to_xs));
+        DEFINE(CFG_STAMP_XSEC, offsetof(struct vdso_data, stamp_xsec));
+        DEFINE(CFG_TB_UPDATE_COUNT, offsetof(struct vdso_data, tb_update_count));
+        DEFINE(CFG_TZ_MINUTEWEST, offsetof(struct vdso_data, tz_minuteswest));
+        DEFINE(CFG_TZ_DSTTIME, offsetof(struct vdso_data, tz_dsttime));
+        DEFINE(CFG_SYSCALL_MAP32, offsetof(struct vdso_data, syscall_map_32));
+        DEFINE(WTOM_CLOCK_SEC, offsetof(struct vdso_data, wtom_clock_sec));
+        DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));
+#ifdef CONFIG_PPC64
+        DEFINE(CFG_SYSCALL_MAP64, offsetof(struct vdso_data, syscall_map_64));
         DEFINE(TVAL64_TV_SEC, offsetof(struct timeval, tv_sec));
         DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec));
         DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec));
         DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec));
+        DEFINE(TSPC32_TV_SEC, offsetof(struct compat_timespec, tv_sec));
+        DEFINE(TSPC32_TV_NSEC, offsetof(struct compat_timespec, tv_nsec));
+#else
+        DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec));
+        DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec));
+        DEFINE(TSPEC32_TV_SEC, offsetof(struct timespec, tv_sec));
+        DEFINE(TSPEC32_TV_NSEC, offsetof(struct timespec, tv_nsec));
+#endif
+        /* timeval/timezone offsets for use by vdso */
         DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));
         DEFINE(TZONE_TZ_DSTTIME, offsetof(struct timezone, tz_dsttime));
-#endif /* CONFIG_PPC64 */
+
+        /* Other bits used by the vdso */
+        DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
+        DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
+        DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
+        DEFINE(CLOCK_REALTIME_RES, TICK_NSEC);
+
         return 0;
 }