Commit 78c85161 authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Thomas Gleixner
Browse files

arm: vdso: Enable arm to use common headers 



Enable arm to use only the common headers in the implementation
of the vDSO library.

Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Russell King <linux@armlinux.org.uk>
Link: https://lkml.kernel.org/r/20200320145351.32292-25-vincenzo.frascino@arm.com
parent abc22418

arch/arm/include/asm/cp15.h

+1 −19
Original line number Diff line number Diff line
@@ -50,25 +50,7 @@ 


#ifdef CONFIG_CPU_CP15



#define __ACCESS_CP15(CRn, Op1, CRm, Op2)	\

	"mrc", "mcr", __stringify(p15, Op1, %0, CRn, CRm, Op2), u32

#define __ACCESS_CP15_64(Op1, CRm)		\

	"mrrc", "mcrr", __stringify(p15, Op1, %Q0, %R0, CRm), u64



#define __read_sysreg(r, w, c, t) ({				\

	t __val;						\

	asm volatile(r " " c : "=r" (__val));			\

	__val;							\

})

#define read_sysreg(...)		__read_sysreg(__VA_ARGS__)



#define __write_sysreg(v, r, w, c, t)	asm volatile(w " " c : : "r" ((t)(v)))

#define write_sysreg(v, ...)		__write_sysreg(v, __VA_ARGS__)



#define BPIALL				__ACCESS_CP15(c7, 0, c5, 6)

#define ICIALLU				__ACCESS_CP15(c7, 0, c5, 0)



#define CNTVCT				__ACCESS_CP15_64(1, c14)

#include <asm/vdso/cp15.h>



extern unsigned long cr_alignment;	/* defined in entry-armv.S */

arch/arm/include/asm/processor.h

+1 −10
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/ptrace.h>

#include <asm/types.h>

#include <asm/unified.h>

#include <asm/vdso/processor.h>



#ifdef __KERNEL__

#define STACK_TOP	((current->personality & ADDR_LIMIT_32BIT) ? \
@@ -85,16 +86,6 @@ extern void release_thread(struct task_struct *); 


unsigned long get_wchan(struct task_struct *p);



#if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327)

#define cpu_relax()						\

	do {							\

		smp_mb();					\

		__asm__ __volatile__("nop; nop; nop; nop; nop; nop; nop; nop; nop; nop;");	\

	} while (0)

#else

#define cpu_relax()			barrier()

#endif



#define task_pt_regs(p) \

	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)

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

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2020 ARM Ltd.

 */

#ifndef __ASM_VDSO_CP15_H

#define __ASM_VDSO_CP15_H



#ifndef __ASSEMBLY__



#ifdef CONFIG_CPU_CP15



#include <linux/stringify.h>



#define __ACCESS_CP15(CRn, Op1, CRm, Op2)	\

	"mrc", "mcr", __stringify(p15, Op1, %0, CRn, CRm, Op2), u32

#define __ACCESS_CP15_64(Op1, CRm)		\

	"mrrc", "mcrr", __stringify(p15, Op1, %Q0, %R0, CRm), u64



#define __read_sysreg(r, w, c, t) ({				\

	t __val;						\

	asm volatile(r " " c : "=r" (__val));			\

	__val;							\

})

#define read_sysreg(...)		__read_sysreg(__VA_ARGS__)



#define __write_sysreg(v, r, w, c, t)	asm volatile(w " " c : : "r" ((t)(v)))

#define write_sysreg(v, ...)		__write_sysreg(v, __VA_ARGS__)



#define BPIALL				__ACCESS_CP15(c7, 0, c5, 6)

#define ICIALLU				__ACCESS_CP15(c7, 0, c5, 0)



#define CNTVCT				__ACCESS_CP15_64(1, c14)



#endif /* CONFIG_CPU_CP15 */



#endif /* __ASSEMBLY__ */



#endif /* __ASM_VDSO_CP15_H */

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

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 


#ifndef __ASSEMBLY__



#include <asm/barrier.h>

#include <asm/cp15.h>

#include <asm/errno.h>

#include <asm/unistd.h>

#include <asm/vdso/cp15.h>

#include <uapi/linux/time.h>



#define VDSO_HAS_CLOCK_GETRES		1

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2020 ARM Ltd.

 */

#ifndef __ASM_VDSO_PROCESSOR_H

#define __ASM_VDSO_PROCESSOR_H



#ifndef __ASSEMBLY__



#if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327)

#define cpu_relax()						\

	do {							\

		smp_mb();					\

		__asm__ __volatile__("nop; nop; nop; nop; nop; nop; nop; nop; nop; nop;");	\

	} while (0)

#else

#define cpu_relax()			barrier()

#endif



#endif /* __ASSEMBLY__ */



#endif /* __ASM_VDSO_PROCESSOR_H */