Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f290da authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6761c4a0

arch/powerpc/kernel/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ CFLAGS_btext.o += -fPIC 
endif



obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \

				   irq.o signal_32.o pmc.o

				   irq.o signal_32.o pmc.o vdso.o

obj-y				+= vdso32/

obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o \

				   paca.o ioctl32.o cpu_setup_power4.o \

				   firmware.o sysfs.o udbg.o

obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_POWER4)		+= idle_power4.o

obj-$(CONFIG_PPC_OF)		+= of_device.o

arch/powerpc/kernel/asm-offsets.c

+31 −14
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/kernel/paca.c

+0 −7
Original line number Diff line number Diff line
@@ -15,17 +15,10 @@ 
#include <asm/processor.h>

#include <asm/ptrace.h>

#include <asm/page.h>

#include <asm/systemcfg.h>

#include <asm/lppaca.h>

#include <asm/iseries/it_lp_queue.h>

#include <asm/paca.h>



static union {

	struct systemcfg	data;

	u8			page[PAGE_SIZE];

} systemcfg_store __attribute__((__section__(".data.page.aligned")));

struct systemcfg *_systemcfg = &systemcfg_store.data;





/* This symbol is provided by the linker - let it fill in the paca

 * field correctly */

arch/powerpc/kernel/proc_ppc64.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/slab.h>

#include <linux/kernel.h>



#include <asm/systemcfg.h>

#include <asm/vdso_datapage.h>

#include <asm/rtas.h>

#include <asm/uaccess.h>

#include <asm/prom.h>
@@ -72,7 +72,7 @@ static int __init proc_ppc64_init(void) 
	if (!pde)

		return 1;

	pde->nlink = 1;

	pde->data = _systemcfg;

	pde->data = vdso_data;

	pde->size = PAGE_SIZE;

	pde->proc_fops = &page_map_fops;

arch/powerpc/kernel/rtas-proc.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <asm/rtas.h>

#include <asm/machdep.h> /* for ppc_md */

#include <asm/time.h>

#include <asm/systemcfg.h>



/* Token for Sensors */

#define KEY_SWITCH		0x0001