Commit 2b4df4d4 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86-64: Use BUILDIO in io_64.h 



Copied from io_32.h.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
LKML-Reference: <1265380629-3212-5-git-send-email-brgerst@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 2e16fc77

arch/x86/include/asm/io_64.h

+37 −75
Original line number Diff line number Diff line
@@ -104,86 +104,48 @@ static inline void slow_down_io(void) 


#endif



/*

 * Talk about misusing macros..

 */

#define __OUT1(s, x)							\

static inline void out##s(unsigned x value, unsigned short port) {



#define __OUT2(s, s1, s2)				\

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") : : "a" (value), "Nd" (port));	\

#define BUILDIO(bwl, bw, type)						\

static inline void out##bwl(unsigned type value, int port)		\

{									\

	asm volatile("out" #bwl " %" #bw "0, %w1"			\

		     : : "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)			\

									\

static inline unsigned type in##bwl(int port)				\

{									\

	RETURN_TYPE _v;



#define __IN2(s, s1, s2)						\

	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;							\

	unsigned type value;						\

	asm volatile("in" #bwl " %w1, %" #bw "0"			\

		     : "=a"(value) : "Nd"(port));			\

	return value;							\

}									\

	__IN1(s##_p) __IN2(s, s1, "w") : "=a" (_v) : "Nd" (port), ##i);	\

									\

static inline void out##bwl##_p(unsigned type value, int port)		\

{									\

	out##bwl(value, port);						\

	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)				\

}									\

									\

static inline unsigned type in##bwl##_p(int port)			\

{									\

	asm volatile ("rep ; ins" #s					\

		      : "=D" (addr), "=c" (count)			\

		      : "d" (port), "0" (addr), "1" (count));		\

}



#define __OUTS(s)							\

static inline void outs##s(unsigned short port, const void *addr,	\

			   unsigned long count)				\

	unsigned type value = in##bwl(port);				\

	slow_down_io();							\

	return value;							\

}									\

									\

static inline void outs##bwl(int port, const void *addr, unsigned long count) \

{									\

	asm volatile ("rep ; outs" #s					\

		      : "=S" (addr), "=c" (count)			\

		      : "d" (port), "0" (addr), "1" (count));		\

	asm volatile("rep; outs" #bwl					\

		     : "+S"(addr), "+c"(count) : "d"(port));		\

}									\

									\

static inline void ins##bwl(int port, void *addr, unsigned long count)	\

{									\

	asm volatile("rep; ins" #bwl					\

		     : "+D"(addr), "+c"(count) : "d"(port));		\

}



#define RETURN_TYPE unsigned char

__IN(b, "")

#undef RETURN_TYPE

#define RETURN_TYPE unsigned short

__IN(w, "")

#undef RETURN_TYPE

#define RETURN_TYPE unsigned int

__IN(l, "")

#undef RETURN_TYPE



__OUT(b, "b", char)

__OUT(w, "w", short)

__OUT(l, , int)



__INS(b)

__INS(w)

__INS(l)



__OUTS(b)

__OUTS(w)

__OUTS(l)



BUILDIO(b, b, char)

BUILDIO(w, w, short)

BUILDIO(l, , int)



#endif /* _ASM_X86_IO_64_H */