mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-27 20:05:14 +07:00
1ee07ef6b5
Pull s390 updates from Martin Schwidefsky:
"This patch set contains the main portion of the changes for 3.18 in
regard to the s390 architecture. It is a bit bigger than usual,
mainly because of a new driver and the vector extension patches.
The interesting bits are:
- Quite a bit of work on the tracing front. Uprobes is enabled and
the ftrace code is reworked to get some of the lost performance
back if CONFIG_FTRACE is enabled.
- To improve boot time with CONFIG_DEBIG_PAGEALLOC, support for the
IPTE range facility is added.
- The rwlock code is re-factored to improve writer fairness and to be
able to use the interlocked-access instructions.
- The kernel part for the support of the vector extension is added.
- The device driver to access the CD/DVD on the HMC is added, this
will hopefully come in handy to improve the installation process.
- Add support for control-unit initiated reconfiguration.
- The crypto device driver is enhanced to enable the additional AP
domains and to allow the new crypto hardware to be used.
- Bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (39 commits)
s390/ftrace: simplify enabling/disabling of ftrace_graph_caller
s390/ftrace: remove 31 bit ftrace support
s390/kdump: add support for vector extension
s390/disassembler: add vector instructions
s390: add support for vector extension
s390/zcrypt: Toleration of new crypto hardware
s390/idle: consolidate idle functions and definitions
s390/nohz: use a per-cpu flag for arch_needs_cpu
s390/vtime: do not reset idle data on CPU hotplug
s390/dasd: add support for control unit initiated reconfiguration
s390/dasd: fix infinite loop during format
s390/mm: make use of ipte range facility
s390/setup: correct 4-level kernel page table detection
s390/topology: call set_sched_topology early
s390/uprobes: architecture backend for uprobes
s390/uprobes: common library for kprobes and uprobes
s390/rwlock: use the interlocked-access facility 1 instructions
s390/rwlock: improve writer fairness
s390/rwlock: remove interrupt-enabling rwlock variant.
s390/mm: remove change bit override support
...
173 lines
4.2 KiB
C
173 lines
4.2 KiB
C
/*
|
|
* Copyright IBM Corp. 2004
|
|
*
|
|
* Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef _S390_CPUTIME_H
|
|
#define _S390_CPUTIME_H
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/div64.h>
|
|
|
|
|
|
/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */
|
|
|
|
typedef unsigned long long __nocast cputime_t;
|
|
typedef unsigned long long __nocast cputime64_t;
|
|
|
|
#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
|
|
|
|
static inline unsigned long __div(unsigned long long n, unsigned long base)
|
|
{
|
|
#ifndef CONFIG_64BIT
|
|
register_pair rp;
|
|
|
|
rp.pair = n >> 1;
|
|
asm ("dr %0,%1" : "+d" (rp) : "d" (base >> 1));
|
|
return rp.subreg.odd;
|
|
#else /* CONFIG_64BIT */
|
|
return n / base;
|
|
#endif /* CONFIG_64BIT */
|
|
}
|
|
|
|
#define cputime_one_jiffy jiffies_to_cputime(1)
|
|
|
|
/*
|
|
* Convert cputime to jiffies and back.
|
|
*/
|
|
static inline unsigned long cputime_to_jiffies(const cputime_t cputime)
|
|
{
|
|
return __div((__force unsigned long long) cputime, 4096000000ULL / HZ);
|
|
}
|
|
|
|
static inline cputime_t jiffies_to_cputime(const unsigned int jif)
|
|
{
|
|
return (__force cputime_t)(jif * (4096000000ULL / HZ));
|
|
}
|
|
|
|
static inline u64 cputime64_to_jiffies64(cputime64_t cputime)
|
|
{
|
|
unsigned long long jif = (__force unsigned long long) cputime;
|
|
do_div(jif, 4096000000ULL / HZ);
|
|
return jif;
|
|
}
|
|
|
|
static inline cputime64_t jiffies64_to_cputime64(const u64 jif)
|
|
{
|
|
return (__force cputime64_t)(jif * (4096000000ULL / HZ));
|
|
}
|
|
|
|
/*
|
|
* Convert cputime to microseconds and back.
|
|
*/
|
|
static inline unsigned int cputime_to_usecs(const cputime_t cputime)
|
|
{
|
|
return (__force unsigned long long) cputime >> 12;
|
|
}
|
|
|
|
static inline cputime_t usecs_to_cputime(const unsigned int m)
|
|
{
|
|
return (__force cputime_t)(m * 4096ULL);
|
|
}
|
|
|
|
#define usecs_to_cputime64(m) usecs_to_cputime(m)
|
|
|
|
/*
|
|
* Convert cputime to milliseconds and back.
|
|
*/
|
|
static inline unsigned int cputime_to_secs(const cputime_t cputime)
|
|
{
|
|
return __div((__force unsigned long long) cputime, 2048000000) >> 1;
|
|
}
|
|
|
|
static inline cputime_t secs_to_cputime(const unsigned int s)
|
|
{
|
|
return (__force cputime_t)(s * 4096000000ULL);
|
|
}
|
|
|
|
/*
|
|
* Convert cputime to timespec and back.
|
|
*/
|
|
static inline cputime_t timespec_to_cputime(const struct timespec *value)
|
|
{
|
|
unsigned long long ret = value->tv_sec * 4096000000ULL;
|
|
return (__force cputime_t)(ret + value->tv_nsec * 4096 / 1000);
|
|
}
|
|
|
|
static inline void cputime_to_timespec(const cputime_t cputime,
|
|
struct timespec *value)
|
|
{
|
|
unsigned long long __cputime = (__force unsigned long long) cputime;
|
|
#ifndef CONFIG_64BIT
|
|
register_pair rp;
|
|
|
|
rp.pair = __cputime >> 1;
|
|
asm ("dr %0,%1" : "+d" (rp) : "d" (2048000000UL));
|
|
value->tv_nsec = rp.subreg.even * 1000 / 4096;
|
|
value->tv_sec = rp.subreg.odd;
|
|
#else
|
|
value->tv_nsec = (__cputime % 4096000000ULL) * 1000 / 4096;
|
|
value->tv_sec = __cputime / 4096000000ULL;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* Convert cputime to timeval and back.
|
|
* Since cputime and timeval have the same resolution (microseconds)
|
|
* this is easy.
|
|
*/
|
|
static inline cputime_t timeval_to_cputime(const struct timeval *value)
|
|
{
|
|
unsigned long long ret = value->tv_sec * 4096000000ULL;
|
|
return (__force cputime_t)(ret + value->tv_usec * 4096ULL);
|
|
}
|
|
|
|
static inline void cputime_to_timeval(const cputime_t cputime,
|
|
struct timeval *value)
|
|
{
|
|
unsigned long long __cputime = (__force unsigned long long) cputime;
|
|
#ifndef CONFIG_64BIT
|
|
register_pair rp;
|
|
|
|
rp.pair = __cputime >> 1;
|
|
asm ("dr %0,%1" : "+d" (rp) : "d" (2048000000UL));
|
|
value->tv_usec = rp.subreg.even / 4096;
|
|
value->tv_sec = rp.subreg.odd;
|
|
#else
|
|
value->tv_usec = (__cputime % 4096000000ULL) / 4096;
|
|
value->tv_sec = __cputime / 4096000000ULL;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* Convert cputime to clock and back.
|
|
*/
|
|
static inline clock_t cputime_to_clock_t(cputime_t cputime)
|
|
{
|
|
unsigned long long clock = (__force unsigned long long) cputime;
|
|
do_div(clock, 4096000000ULL / USER_HZ);
|
|
return clock;
|
|
}
|
|
|
|
static inline cputime_t clock_t_to_cputime(unsigned long x)
|
|
{
|
|
return (__force cputime_t)(x * (4096000000ULL / USER_HZ));
|
|
}
|
|
|
|
/*
|
|
* Convert cputime64 to clock.
|
|
*/
|
|
static inline clock_t cputime64_to_clock_t(cputime64_t cputime)
|
|
{
|
|
unsigned long long clock = (__force unsigned long long) cputime;
|
|
do_div(clock, 4096000000ULL / USER_HZ);
|
|
return clock;
|
|
}
|
|
|
|
cputime64_t arch_cpu_idle_time(int cpu);
|
|
|
|
#define arch_idle_time(cpu) arch_cpu_idle_time(cpu)
|
|
|
|
#endif /* _S390_CPUTIME_H */
|