android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[S390] delay: implement ndelay

Browse Source 
Implement ndelay() on s390 as well.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2011-05-26 09:48:28 +02:00
parent ac5fa22fd4
commit b396637841
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/s390/include/asm/delay.h
View File

@ -14,10 +14,12 @@
#ifndef _S390_DELAY_H #ifndef _S390_DELAY_H
#define _S390_DELAY_H #define _S390_DELAY_H
extern void __udelay(unsigned long long usecs); void __ndelay(unsigned long long nsecs);
extern void udelay_simple(unsigned long long usecs); void __udelay(unsigned long long usecs);
extern void __delay(unsigned long loops); void udelay_simple(unsigned long long usecs);
void __delay(unsigned long loops);
#define ndelay(n) __ndelay((unsigned long long) (n))
#define udelay(n) __udelay((unsigned long long) (n)) #define udelay(n) __udelay((unsigned long long) (n))
#define mdelay(n) __udelay((unsigned long long) (n) * 1000) #define mdelay(n) __udelay((unsigned long long) (n) * 1000)

15
arch/s390/lib/delay.c
View File

@ -12,6 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/div64.h>
void __delay(unsigned long loops) void __delay(unsigned long loops)
{ {
@ -116,3 +117,17 @@ void udelay_simple(unsigned long long usecs)
while (get_clock() < end) while (get_clock() < end)
cpu_relax(); cpu_relax();
} }
void __ndelay(unsigned long long nsecs)
{
u64 end;
nsecs <<= 9;
do_div(nsecs, 125);
end = get_clock() + nsecs;
if (nsecs & ~0xfffUL)
__udelay(nsecs >> 12);
while (get_clock() < end)
barrier();
}
EXPORT_SYMBOL(__ndelay);