-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The mips vDSO library requires some adaptations to take advantage of the newly introduced generic vDSO library. Introduce the following changes: - Modification of vdso.c to be compliant with the common vdso datapage - Use of lib/vdso for gettimeofday Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Burton <paul.burton@mips.com> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> [paul.burton@mips.com: Prepend $(src) to config-n32-o32-env.c path.] Signed-off-by: Paul Burton <paul.burton@mips.com>
- Loading branch information
1 parent
c2aeaae
commit 24640f2
Showing
11 changed files
with
296 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,151 @@ | ||
/* | ||
* Copyright (C) 2018 ARM Limited | ||
* Copyright (C) 2015 Imagination Technologies | ||
* Author: Alex Smith <alex.smith@imgtec.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License as published by the | ||
* Free Software Foundation; either version 2 of the License, or (at your | ||
* option) any later version. | ||
*/ | ||
#ifndef __ASM_VDSO_GETTIMEOFDAY_H | ||
#define __ASM_VDSO_GETTIMEOFDAY_H | ||
|
||
#ifndef __ASSEMBLY__ | ||
|
||
#include <linux/compiler.h> | ||
#include <linux/time.h> | ||
|
||
#include <asm/vdso/vdso.h> | ||
#include <asm/clocksource.h> | ||
#include <asm/io.h> | ||
#include <asm/unistd.h> | ||
#include <asm/vdso.h> | ||
|
||
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL | ||
|
||
static __always_inline long gettimeofday_fallback( | ||
struct __kernel_old_timeval *_tv, | ||
struct timezone *_tz) | ||
{ | ||
register struct timezone *tz asm("a1") = _tz; | ||
register struct __kernel_old_timeval *tv asm("a0") = _tv; | ||
register long ret asm("v0"); | ||
register long nr asm("v0") = __NR_gettimeofday; | ||
register long error asm("a3"); | ||
|
||
asm volatile( | ||
" syscall\n" | ||
: "=r" (ret), "=r" (error) | ||
: "r" (tv), "r" (tz), "r" (nr) | ||
: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", | ||
"$14", "$15", "$24", "$25", "hi", "lo", "memory"); | ||
|
||
return error ? -ret : ret; | ||
} | ||
|
||
#else | ||
|
||
static __always_inline long gettimeofday_fallback( | ||
struct __kernel_old_timeval *_tv, | ||
struct timezone *_tz) | ||
{ | ||
return -1; | ||
} | ||
|
||
#endif | ||
|
||
static __always_inline long clock_gettime_fallback( | ||
clockid_t _clkid, | ||
struct __kernel_timespec *_ts) | ||
{ | ||
register struct __kernel_timespec *ts asm("a1") = _ts; | ||
register clockid_t clkid asm("a0") = _clkid; | ||
register long ret asm("v0"); | ||
#if _MIPS_SIM == _MIPS_SIM_ABI64 | ||
register long nr asm("v0") = __NR_clock_gettime; | ||
#else | ||
register long nr asm("v0") = __NR_clock_gettime64; | ||
#endif | ||
register long error asm("a3"); | ||
|
||
asm volatile( | ||
" syscall\n" | ||
: "=r" (ret), "=r" (error) | ||
: "r" (clkid), "r" (ts), "r" (nr) | ||
: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", | ||
"$14", "$15", "$24", "$25", "hi", "lo", "memory"); | ||
|
||
return error ? -ret : ret; | ||
} | ||
|
||
#ifdef CONFIG_CSRC_R4K | ||
|
||
static __always_inline u64 read_r4k_count(void) | ||
{ | ||
unsigned int count; | ||
|
||
__asm__ __volatile__( | ||
" .set push\n" | ||
" .set mips32r2\n" | ||
" rdhwr %0, $2\n" | ||
" .set pop\n" | ||
: "=r" (count)); | ||
|
||
return count; | ||
} | ||
|
||
#endif | ||
|
||
#ifdef CONFIG_CLKSRC_MIPS_GIC | ||
|
||
static __always_inline u64 read_gic_count(const struct vdso_data *data) | ||
{ | ||
void __iomem *gic = get_gic(data); | ||
u32 hi, hi2, lo; | ||
|
||
do { | ||
hi = __raw_readl(gic + sizeof(lo)); | ||
lo = __raw_readl(gic); | ||
hi2 = __raw_readl(gic + sizeof(lo)); | ||
} while (hi2 != hi); | ||
|
||
return (((u64)hi) << 32) + lo; | ||
} | ||
|
||
#endif | ||
|
||
static __always_inline u64 __arch_get_hw_counter(s32 clock_mode) | ||
{ | ||
#ifdef CONFIG_CLKSRC_MIPS_GIC | ||
const struct vdso_data *data = get_vdso_data(); | ||
#endif | ||
u64 cycle_now; | ||
|
||
switch (clock_mode) { | ||
#ifdef CONFIG_CSRC_R4K | ||
case VDSO_CLOCK_R4K: | ||
cycle_now = read_r4k_count(); | ||
break; | ||
#endif | ||
#ifdef CONFIG_CLKSRC_MIPS_GIC | ||
case VDSO_CLOCK_GIC: | ||
cycle_now = read_gic_count(data); | ||
break; | ||
#endif | ||
default: | ||
cycle_now = 0; | ||
break; | ||
} | ||
|
||
return cycle_now; | ||
} | ||
|
||
static __always_inline const struct vdso_data *__arch_get_vdso_data(void) | ||
{ | ||
return get_vdso_data(); | ||
} | ||
|
||
#endif /* !__ASSEMBLY__ */ | ||
|
||
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* SPDX-License-Identifier: GPL-2.0 */ | ||
#ifndef __ASM_VDSO_VSYSCALL_H | ||
#define __ASM_VDSO_VSYSCALL_H | ||
|
||
#ifndef __ASSEMBLY__ | ||
|
||
#include <linux/timekeeper_internal.h> | ||
#include <vdso/datapage.h> | ||
|
||
extern struct vdso_data *vdso_data; | ||
|
||
/* | ||
* Update the vDSO data page to keep in sync with kernel timekeeping. | ||
*/ | ||
static __always_inline | ||
struct vdso_data *__mips_get_k_vdso_data(void) | ||
{ | ||
return vdso_data; | ||
} | ||
#define __arch_get_k_vdso_data __mips_get_k_vdso_data | ||
|
||
static __always_inline | ||
int __mips_get_clock_mode(struct timekeeper *tk) | ||
{ | ||
u32 clock_mode = tk->tkr_mono.clock->archdata.vdso_clock_mode; | ||
|
||
return clock_mode; | ||
} | ||
#define __arch_get_clock_mode __mips_get_clock_mode | ||
|
||
static __always_inline | ||
int __mips_use_vsyscall(struct vdso_data *vdata) | ||
{ | ||
return (vdata[CS_HRES_COARSE].clock_mode != VDSO_CLOCK_NONE); | ||
} | ||
#define __arch_use_vsyscall __mips_use_vsyscall | ||
|
||
/* The asm-generic header needs to be included after the definitions above */ | ||
#include <asm-generic/vdso/vsyscall.h> | ||
|
||
#endif /* !__ASSEMBLY__ */ | ||
|
||
#endif /* __ASM_VDSO_VSYSCALL_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.