Commit 715f23b6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ARM: vdso: Set BUILD_VDSO32 and provide 32bit fallbacks 



Setting BUILD_VDSO32 is required to expose the legacy 32bit interfaces in
the generic VDSO code which are going to be hidden behind an #ifdef
BUILD_VDSO32.

The 32bit fallbacks are necessary to remove the existing
VDSO_HAS_32BIT_FALLBACK hackery.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/87tv4zq9dc.fsf@nanos.tec.linutronix.de
parent 3b5584af

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

+36 −0
Original line number Diff line number Diff line
@@ -52,6 +52,24 @@ static __always_inline long clock_gettime_fallback( 
	return ret;

}



static __always_inline long clock_gettime32_fallback(

					clockid_t _clkid,

					struct old_timespec32 *_ts)

{

	register struct old_timespec32 *ts asm("r1") = _ts;

	register clockid_t clkid asm("r0") = _clkid;

	register long ret asm ("r0");

	register long nr asm("r7") = __NR_clock_gettime;



	asm volatile(

	"	swi #0\n"

	: "=r" (ret)

	: "r" (clkid), "r" (ts), "r" (nr)

	: "memory");



	return ret;

}



static __always_inline int clock_getres_fallback(

					clockid_t _clkid,

					struct __kernel_timespec *_ts)
@@ -70,6 +88,24 @@ static __always_inline int clock_getres_fallback( 
	return ret;

}



static __always_inline int clock_getres32_fallback(

					clockid_t _clkid,

					struct old_timespec32 *_ts)

{

	register struct old_timespec32 *ts asm("r1") = _ts;

	register clockid_t clkid asm("r0") = _clkid;

	register long ret asm ("r0");

	register long nr asm("r7") = __NR_clock_getres;



	asm volatile(

	"       swi #0\n"

	: "=r" (ret)

	: "r" (clkid), "r" (ts), "r" (nr)

	: "memory");



	return ret;

}



static __always_inline u64 __arch_get_hw_counter(int clock_mode)

{

#ifdef CONFIG_ARM_ARCH_TIMER

arch/arm/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.so.raw vdso.lds 
obj-vdso := $(addprefix $(obj)/, $(obj-vdso))



ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector

ccflags-y += -DDISABLE_BRANCH_PROFILING

ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO32



ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8

ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \

CRA Git | Maintained and supported by SUSTech CRA and CCSE