diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 13:31:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:10 +0100 |
| commit | ba082427ae6ffbf8e48a26ae4f72f4501a6b80c1 (patch) | |
| tree | 88c48bd8a3be3639a8fa8e0451fb536fde7d2361 | |
| parent | ee238e5ca66858f80170f87724f84d67183b069a (diff) | |
x86: tweak io_64.h for paravirt.
We need something here because we can't call in and out instructions
directly. However, we have to be careful, because no indirections are
allowed in misc_64.c , and paravirt_ops is a kind of one. So just
call it directly there
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/boot/compressed/misc_64.c | 6 | ||||
| -rw-r--r-- | include/asm-x86/io_64.h | 30 |
2 files changed, 29 insertions, 7 deletions
diff --git a/arch/x86/boot/compressed/misc_64.c b/arch/x86/boot/compressed/misc_64.c index 43e5fcc37be9..7d8338e21b00 100644 --- a/arch/x86/boot/compressed/misc_64.c +++ b/arch/x86/boot/compressed/misc_64.c @@ -9,6 +9,12 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +/* + * we have to be careful, because no indirections are allowed here, and + * paravirt_ops is a kind of one. As it will only run in baremetal anyway, + * we just keep it from happening + */ +#undef CONFIG_PARAVIRT #define _LINUX_STRING_H_ 1 #define __LINUX_BITMAP_H 1 diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index dbcc03aa1c6a..fef0ce2ced81 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h @@ -40,6 +40,10 @@ extern void native_io_delay(void); extern int io_delay_type; extern void io_delay_init(void); +#if defined(CONFIG_PARAVIRT) +#include <asm/paravirt.h> +#else + static inline void slow_down_io(void) { native_io_delay(); @@ -49,6 +53,7 @@ static inline void slow_down_io(void) native_io_delay(); #endif } +#endif /* * Talk about misusing macros.. @@ -57,21 +62,32 @@ static inline void slow_down_io(void) static inline void out##s(unsigned x value, unsigned short port) { #define __OUT2(s,s1,s2) \ -__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" : : "a" (value), "Nd" (port)) +__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" + +#ifndef REALLY_SLOW_IO +#define REALLY_SLOW_IO +#define UNSET_REALLY_SLOW_IO +#endif #define __OUT(s,s1,x) \ -__OUT1(s,x) __OUT2(s,s1,"w"); } \ -__OUT1(s##_p,x) __OUT2(s,s1,"w"); slow_down_io(); } +__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "Nd" (port)); } \ +__OUT1(s##_p, x) __OUT2(s, s1, "w") : : "a" (value), "Nd" (port)); \ + slow_down_io(); } #define __IN1(s) \ static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v; #define __IN2(s,s1,s2) \ -__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" : "=a" (_v) : "Nd" (port)) +__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" + +#define __IN(s,s1,i...) \ +__IN1(s) __IN2(s, s1, "w") : "=a" (_v) : "Nd" (port), ##i); return _v; } \ +__IN1(s##_p) __IN2(s, s1, "w") : "=a" (_v) : "Nd" (port), ##i); \ + slow_down_io(); return _v; } -#define __IN(s,s1) \ -__IN1(s) __IN2(s,s1,"w"); return _v; } \ -__IN1(s##_p) __IN2(s,s1,"w"); slow_down_io(); return _v; } +#ifdef UNSET_REALLY_SLOW_IO +#undef REALLY_SLOW_IO +#endif #define __INS(s) \ static inline void ins##s(unsigned short port, void * addr, unsigned long count) \ |