Commit d60c682b authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

sparc64: vdso: Move syscall fallbacks into header 



The generic vDSO libraries expected the syscall fallbacks in
asm/vdso/gettimeofday.h. To prepare the adoption of the generic library,
move the existing functions there.

While at it, rename them so they match what the generic library expects.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Tested-by: default avatarAndreas Larsson <andreas@gaisler.com>
Reviewed-by: default avatarAndreas Larsson <andreas@gaisler.com>
Acked-by: default avatarAndreas Larsson <andreas@gaisler.com>
Link: https://patch.msgid.link/20260304-vdso-sparc64-generic-2-v6-8-d8eb3b0e1410@linutronix.de
parent 10fdbd95

arch/sparc/include/asm/vdso/gettimeofday.h

+50 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
#ifndef _ASM_SPARC_VDSO_GETTIMEOFDAY_H

#define _ASM_SPARC_VDSO_GETTIMEOFDAY_H



#include <uapi/linux/time.h>

#include <uapi/linux/unistd.h>



#include <linux/types.h>

#include <asm/vvar.h>
@@ -75,4 +78,51 @@ static __always_inline u64 __arch_get_hw_counter(struct vvar_data *vvar) 
		return vread_tick();

}



#ifdef	CONFIG_SPARC64

#define SYSCALL_STRING							\

	"ta	0x6d;"							\

	"bcs,a	1f;"							\

	" sub	%%g0, %%o0, %%o0;"					\

	"1:"

#else

#define SYSCALL_STRING							\

	"ta	0x10;"							\

	"bcs,a	1f;"							\

	" sub	%%g0, %%o0, %%o0;"					\

	"1:"

#endif



#define SYSCALL_CLOBBERS						\

	"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",			\

	"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",		\

	"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",		\

	"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",		\

	"f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46",		\

	"f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62",		\

	"cc", "memory"



static __always_inline

long clock_gettime_fallback(clockid_t clock, struct __kernel_old_timespec *ts)

{

	register long num __asm__("g1") = __NR_clock_gettime;

	register long o0 __asm__("o0") = clock;

	register long o1 __asm__("o1") = (long) ts;



	__asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num),

			     "0" (o0), "r" (o1) : SYSCALL_CLOBBERS);

	return o0;

}



static __always_inline

long gettimeofday_fallback(struct __kernel_old_timeval *tv, struct timezone *tz)

{

	register long num __asm__("g1") = __NR_gettimeofday;

	register long o0 __asm__("o0") = (long) tv;

	register long o1 __asm__("o1") = (long) tz;



	__asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num),

			     "0" (o0), "r" (o1) : SYSCALL_CLOBBERS);

	return o0;

}



#endif /* _ASM_SPARC_VDSO_GETTIMEOFDAY_H */

arch/sparc/vdso/vclock_gettime.c

+2 −49
Original line number Diff line number Diff line
@@ -13,38 +13,13 @@ 
 */



#include <linux/kernel.h>

#include <linux/time.h>

#include <linux/string.h>

#include <asm/io.h>

#include <asm/unistd.h>

#include <asm/timex.h>

#include <asm/clocksource.h>

#include <asm/vdso/gettimeofday.h>

#include <asm/vvar.h>



#ifdef	CONFIG_SPARC64

#define SYSCALL_STRING							\

	"ta	0x6d;"							\

	"bcs,a	1f;"							\

	" sub	%%g0, %%o0, %%o0;"					\

	"1:"

#else

#define SYSCALL_STRING							\

	"ta	0x10;"							\

	"bcs,a	1f;"							\

	" sub	%%g0, %%o0, %%o0;"					\

	"1:"

#endif



#define SYSCALL_CLOBBERS						\

	"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",			\

	"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",		\

	"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",		\

	"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",		\

	"f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46",		\

	"f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62",		\

	"cc", "memory"



/*

 * Compute the vvar page's address in the process address space, and return it

 * as a pointer to the vvar_data.
@@ -64,28 +39,6 @@ notrace static __always_inline struct vvar_data *get_vvar_data(void) 
	return (struct vvar_data *) ret;

}



notrace static long vdso_fallback_gettime(long clock, struct __kernel_old_timespec *ts)

{

	register long num __asm__("g1") = __NR_clock_gettime;

	register long o0 __asm__("o0") = clock;

	register long o1 __asm__("o1") = (long) ts;



	__asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num),

			     "0" (o0), "r" (o1) : SYSCALL_CLOBBERS);

	return o0;

}



notrace static long vdso_fallback_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)

{

	register long num __asm__("g1") = __NR_gettimeofday;

	register long o0 __asm__("o0") = (long) tv;

	register long o1 __asm__("o1") = (long) tz;



	__asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num),

			     "0" (o0), "r" (o1) : SYSCALL_CLOBBERS);

	return o0;

}



notrace static __always_inline u64 vgetsns(struct vvar_data *vvar)

{

	u64 v;
@@ -184,7 +137,7 @@ __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) 
	/*

	 * Unknown clock ID ? Fall back to the syscall.

	 */

	return vdso_fallback_gettime(clock, ts);

	return clock_gettime_fallback(clock, ts);

}

int

clock_gettime(clockid_t, struct __kernel_old_timespec *)
@@ -220,7 +173,7 @@ __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) 
		}

		return 0;

	}

	return vdso_fallback_gettimeofday(tv, tz);

	return gettimeofday_fallback(tv, tz);

}

int

gettimeofday(struct __kernel_old_timeval *, struct timezone *)