x86: Merge 32-bit and 64-bit io.h
cover x86: Merge 32-bit and 64-bit io.h
This patch series cleans up and merges the 32-bit and 64-bit implementations of io.h
[PATCH 1/7] x86-32: Move XQUAD definitions to numaq.h [PATCH 2/7] x86-32: Remove _local variants of in/out from io_32.h [PATCH 3/7] x86-64: Reorganize io_64.h
[PATCH 4/7] x86-64: Use BUILDIO in io_64.h
[PATCH 5/7] x86: Clean up mem*io functions.
[PATCH 6/7] x86: Simplify flush_write_buffers()
[PATCH 7/7] x86: Merge io.h
arch/x86/boot/compressed/misc.c | 13 +-- arch/x86/include/asm/io.h | 155 ++++++++++++++++++++++++++++++- arch/x86/include/asm/io_32.h | 196 --------------------------------------- arch/x86/include/asm/io_64.h | 181 ------------------------------------ arch/x86/include/asm/numaq.h | 4 + arch/x86/lib/Makefile | 2 +- arch/x86/lib/io_64.c | 25 ----- arch/x86/pci/numaq_32.c | 6 +- 8 files changed, 162 insertions(+), 420 deletions(-)
PATCH 1/7 x86-32: Move XQUAD definitions to numaq.h
--- arch/x86/include/asm/io_32.h | 3 --- arch/x86/include/asm/numaq.h | 4 ++++ arch/x86/pci/numaq_32.c | 6 +----- 3 files changed, 5 insertions(+), 8 deletions(-)
arch/x86/include/asm/io_32.h +0 -3
@@ -37,9 +37,6 @@* - Arnaldo Carvalho de Melo <[email protected]> */ -#define XQUAD_PORTIO_BASE 0xfe400000 -#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ -#ifdef __KERNEL__#include <asm-generic/iomap.h>
arch/x86/include/asm/numaq.h +4 -0
@@ -33,6 +33,10 @@ extern int get_memcfg_numaq(void);extern void *xquad_portio; +#define XQUAD_PORTIO_BASE 0xfe400000 +#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ +#define XQUAD_PORT_ADDR (port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) +/* * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the */
arch/x86/pci/numaq_32.c +1 -5
@@ -8,9 +8,7 @@#include <asm/apic.h> #include <asm/mpspec.h> #include <asm/pci_x86.h> - -#define XQUAD_PORTIO_BASE 0xfe400000 -#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ +#include <asm/numaq.h> #define BUS2QUAD (global) (mp_bus_id_to_node[global])
@@ -18,8 +16,6 @@#define QUADLOCAL2BUS (quad,local) (quad_local_to_mp_bus_id[quad][local]) -#define XQUAD_PORT_ADDR (port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) -#define PCI_CONF1_MQ_ADDRESS (bus, devfn, reg) \ (0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))
Signature · 1 line
1.6.6
[tip:x86/io] x86-32: Move XQUAD definitions to numaq.h
Commit-ID: 5c64c7019e571a726f4aa9c1896402c15391a8ed Gitweb: http://git.kernel.org/tip/5c64c7019e571a726f4aa9c1896402c15391a8ed Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:03 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:12 -0800
x86-32: Move XQUAD definitions to numaq.h
The XQUAD stuff is part of the NUMAQ architecture, so move it there.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_32.h | 3 --- arch/x86/include/asm/numaq.h | 4 ++++ arch/x86/pci/numaq_32.c | 6 +----- 3 files changed, 5 insertions(+), 8 deletions(-)
arch/x86/include/asm/io_32.h +0 -3
@@ -37,9 +37,6 @@* - Arnaldo Carvalho de Melo <[email protected]> */ -#define XQUAD_PORTIO_BASE 0xfe400000 -#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ -#ifdef __KERNEL__#include <asm-generic/iomap.h>
arch/x86/include/asm/numaq.h +4 -0
@@ -33,6 +33,10 @@ extern int get_memcfg_numaq(void);extern void *xquad_portio; +#define XQUAD_PORTIO_BASE 0xfe400000 +#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ +#define XQUAD_PORT_ADDR (port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) +/* * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the */
arch/x86/pci/numaq_32.c +1 -5
@@ -8,9 +8,7 @@#include <asm/apic.h> #include <asm/mpspec.h> #include <asm/pci_x86.h> - -#define XQUAD_PORTIO_BASE 0xfe400000 -#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */ +#include <asm/numaq.h> #define BUS2QUAD (global) (mp_bus_id_to_node[global])
@@ -18,8 +16,6 @@#define QUADLOCAL2BUS (quad,local) (quad_local_to_mp_bus_id[quad][local]) -#define XQUAD_PORT_ADDR (port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) -#define PCI_CONF1_MQ_ADDRESS (bus, devfn, reg) \ (0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))
PATCH 2/7 x86-32: Remove _local variants of in/out from io_32.h
In reply to Brian GerstThese were leftover from the numaq support that was removed in commit 1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.
--- arch/x86/include/asm/io_32.h | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-)
arch/x86/include/asm/io_32.h +4 -30
@@ -120,47 +120,21 @@ static inline void slow_down_io(void)#endif -#define __BUILDIO (bwl, bw, type) \ -static inline void out##bwl(unsigned type value, int port) \ -{ \ - out##bwl##_local(value, port); \ -} \ - \ -static inline unsigned type in##bwl(int port) \ -{ \ - return in##bwl##_local(port); \ -} -#define BUILDIO (bwl, bw, type) \ -static inline void out##bwl##_local(unsigned type value, int port) \ +static inline void out##bwl(unsigned type value, int port) \ { \ - asm volatile("out" #bwl " %" #bw "0, %w1" \ + asm volatile("out" #bwl " %" #bw "0, %w1" \ : : "a"(value), "Nd"(port)); \ } \ \ -static inline unsigned type in##bwl##_local(int port) \ +static inline unsigned type in##bwl(int port) \ { \ unsigned type value; \ - asm volatile("in" #bwl " %w1, %" #bw "0" \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ : "=a"(value) : "Nd"(port)); \ return value; \ } \ \ -static inline void out##bwl##_local_p(unsigned type value, int port) \ -{ \ - out##bwl##_local(value, port); \ - slow_down_io(); \ -} \ - \ -static inline unsigned type in##bwl##_local_p(int port) \ -{ \ - unsigned type value = in##bwl##_local(port); \ - slow_down_io(); \ - return value; \ -} \ - \ -__BUILDIO(bwl, bw, type) \ - \ static inline void out##bwl##_p(unsigned type value, int port) \ { \ out##bwl(value, port); \
Signature · 1 line
1.6.6
[tip:x86/io] x86-32: Remove _local variants of in/out from io_32.h
Commit-ID: bd2984e96452855d148ebce76f696dcecbc96340 Gitweb: http://git.kernel.org/tip/bd2984e96452855d148ebce76f696dcecbc96340 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:04 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:18 -0800
x86-32: Remove _local variants of in/out from io_32.h
These were leftover from the numaq support that was removed in commit 1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_32.h | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-)
arch/x86/include/asm/io_32.h +4 -30
@@ -120,47 +120,21 @@ static inline void slow_down_io(void)#endif -#define __BUILDIO (bwl, bw, type) \ -static inline void out##bwl(unsigned type value, int port) \ -{ \ - out##bwl##_local(value, port); \ -} \ - \ -static inline unsigned type in##bwl(int port) \ -{ \ - return in##bwl##_local(port); \ -} -#define BUILDIO (bwl, bw, type) \ -static inline void out##bwl##_local(unsigned type value, int port) \ +static inline void out##bwl(unsigned type value, int port) \ { \ - asm volatile("out" #bwl " %" #bw "0, %w1" \ + asm volatile("out" #bwl " %" #bw "0, %w1" \ : : "a"(value), "Nd"(port)); \ } \ \ -static inline unsigned type in##bwl##_local(int port) \ +static inline unsigned type in##bwl(int port) \ { \ unsigned type value; \ - asm volatile("in" #bwl " %w1, %" #bw "0" \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ : "=a"(value) : "Nd"(port)); \ return value; \ } \ \ -static inline void out##bwl##_local_p(unsigned type value, int port) \ -{ \ - out##bwl##_local(value, port); \ - slow_down_io(); \ -} \ - \ -static inline unsigned type in##bwl##_local_p(int port) \ -{ \ - unsigned type value = in##bwl##_local(port); \ - slow_down_io(); \ - return value; \ -} \ - \ -__BUILDIO(bwl, bw, type) \ - \ static inline void out##bwl##_p(unsigned type value, int port) \ { \ out##bwl(value, port); \
PATCH 3/7 x86-64: Reorganize io_64.h
In reply to Brian GerstMake it more similar to io_32.h. No real code changes.
--- arch/x86/include/asm/io_64.h | 90 +++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 41 deletions(-)
arch/x86/include/asm/io_64.h +49 -41
@@ -35,6 +35,54 @@* - Arnaldo Carvalho de Melo <[email protected]> */ +#ifdef __KERNEL__ + +#include <asm-generic/iomap.h> + +#include <linux/vmalloc.h> + +/* +* Convert a virtual cached pointer to an uncached pointer +*/ +#define xlate_dev_kmem_ptr (p) p + +void memset_io (volatile void __iomem *a,int b,size_t c); + +void __memcpy_fromio (void *,unsigned long ,unsigned ); +static inline void memcpy_fromio (void *to,const volatile void __iomem *from, +unsigned len) +{ +__memcpy_fromio (to, (unsigned long )from, len); +} + +void __memcpy_toio (unsigned long ,const void *,unsigned ); +static inline void memcpy_toio (volatile void __iomem *to,const void *from, +unsigned len) +{ +__memcpy_toio ((unsigned long )to, from, len); +} + +/* +* ISA space is 'always mapped' on a typical x86 system, no need to +* explicitly ioremap() it. The fact that the ISA IO space is mapped +* to PAGE_OFFSET is pure coincidence - it does not mean ISA values +* are physical addresses. The following constant pointer can be +* used as the IO-area pointer (it can be iounmapped as well, so the +* analogy with PCI is quite large): +*/ +#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) + +/* +* Cache management +* +* This needed for two cases +* 1. Out of order aware processors +* 2. Accidentally out of order processors (PPro errata #51) +*/ +#define flush_write_buffers () do { } while (0) + +#endif /* __KERNEL__ */ +extern void native_io_delay (void );extern int io_delay_type;
@@ -53,6 +101,7 @@ static inline void slow_down_io(void)native_io_delay (); #endif } +#endif /*
@@ -136,46 +185,5 @@ __OUTS(b) __OUTS(w) __OUTS(l) -#if defined(__KERNEL__) && defined(__x86_64__) - -#include <linux/vmalloc.h> - -#include <asm-generic/iomap.h> - -void __memcpy_fromio (void *,unsigned long ,unsigned ); -void __memcpy_toio (unsigned long ,const void *,unsigned ); - -static inline void memcpy_fromio (void *to,const volatile void __iomem *from, -unsigned len) -{ -__memcpy_fromio (to, (unsigned long )from, len); -} - -static inline void memcpy_toio (volatile void __iomem *to,const void *from, -unsigned len) -{ -__memcpy_toio ((unsigned long )to, from, len); -} - -void memset_io (volatile void __iomem *a,int b,size_t c); - -/* -* ISA space is 'always mapped' on a typical x86 system, no need to -* explicitly ioremap() it. The fact that the ISA IO space is mapped -* to PAGE_OFFSET is pure coincidence - it does not mean ISA values -* are physical addresses. The following constant pointer can be -* used as the IO-area pointer (it can be iounmapped as well, so the -* analogy with PCI is quite large): -*/ -#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) - -#define flush_write_buffers () - -/* -* Convert a virtual cached pointer to an uncached pointer -*/ -#define xlate_dev_kmem_ptr (p) p - -#endif /* __KERNEL__ */ #endif /* _ASM_X86_IO_64_H */
Signature · 1 line
1.6.6
[tip:x86/io] x86-64: Reorganize io_64.h
Commit-ID: 2e16fc7728a77755b5b2dc6b27dde62cd97b9ea5 Gitweb: http://git.kernel.org/tip/2e16fc7728a77755b5b2dc6b27dde62cd97b9ea5 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:05 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:22 -0800
x86-64: Reorganize io_64.h
Make it more similar to io_32.h. No real code changes.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_64.h | 90 +++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 41 deletions(-)
arch/x86/include/asm/io_64.h +49 -41
@@ -35,6 +35,54 @@* - Arnaldo Carvalho de Melo <[email protected]> */ +#ifdef __KERNEL__ + +#include <asm-generic/iomap.h> + +#include <linux/vmalloc.h> + +/* +* Convert a virtual cached pointer to an uncached pointer +*/ +#define xlate_dev_kmem_ptr (p) p + +void memset_io (volatile void __iomem *a,int b,size_t c); + +void __memcpy_fromio (void *,unsigned long ,unsigned ); +static inline void memcpy_fromio (void *to,const volatile void __iomem *from, +unsigned len) +{ +__memcpy_fromio (to, (unsigned long )from, len); +} + +void __memcpy_toio (unsigned long ,const void *,unsigned ); +static inline void memcpy_toio (volatile void __iomem *to,const void *from, +unsigned len) +{ +__memcpy_toio ((unsigned long )to, from, len); +} + +/* +* ISA space is 'always mapped' on a typical x86 system, no need to +* explicitly ioremap() it. The fact that the ISA IO space is mapped +* to PAGE_OFFSET is pure coincidence - it does not mean ISA values +* are physical addresses. The following constant pointer can be +* used as the IO-area pointer (it can be iounmapped as well, so the +* analogy with PCI is quite large): +*/ +#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) + +/* +* Cache management +* +* This needed for two cases +* 1. Out of order aware processors +* 2. Accidentally out of order processors (PPro errata #51) +*/ +#define flush_write_buffers () do { } while (0) + +#endif /* __KERNEL__ */ +extern void native_io_delay (void );extern int io_delay_type;
@@ -53,6 +101,7 @@ static inline void slow_down_io(void)native_io_delay (); #endif } +#endif /*
@@ -136,46 +185,5 @@ __OUTS(b) __OUTS(w) __OUTS(l) -#if defined(__KERNEL__) && defined(__x86_64__) - -#include <linux/vmalloc.h> - -#include <asm-generic/iomap.h> - -void __memcpy_fromio (void *,unsigned long ,unsigned ); -void __memcpy_toio (unsigned long ,const void *,unsigned ); - -static inline void memcpy_fromio (void *to,const volatile void __iomem *from, -unsigned len) -{ -__memcpy_fromio (to, (unsigned long )from, len); -} - -static inline void memcpy_toio (volatile void __iomem *to,const void *from, -unsigned len) -{ -__memcpy_toio ((unsigned long )to, from, len); -} - -void memset_io (volatile void __iomem *a,int b,size_t c); - -/* -* ISA space is 'always mapped' on a typical x86 system, no need to -* explicitly ioremap() it. The fact that the ISA IO space is mapped -* to PAGE_OFFSET is pure coincidence - it does not mean ISA values -* are physical addresses. The following constant pointer can be -* used as the IO-area pointer (it can be iounmapped as well, so the -* analogy with PCI is quite large): -*/ -#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) - -#define flush_write_buffers () - -/* -* Convert a virtual cached pointer to an uncached pointer -*/ -#define xlate_dev_kmem_ptr (p) p - -#endif /* __KERNEL__ */ #endif /* _ASM_X86_IO_64_H */
PATCH 4/7 x86-64: Use BUILDIO in io_64.h
In reply to Brian GerstCopied from io_32.h.
--- arch/x86/include/asm/io_64.h | 112 ++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 75 deletions(-)
arch/x86/include/asm/io_64.h +37 -75
@@ -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)); \ - } \ - __OUT1(s##_p, 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)); \ +} \ + \ +static inline unsigned type in##bwl(int port) \ +{ \ + unsigned type value; \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ + : "=a"(value) : "Nd"(port)); \ + return value; \ +} \ + \ +static inline void out##bwl##_p(unsigned type value, int port) \ +{ \ + out##bwl(value, port); \ slow_down_io(); \ -} - -#define __IN1 (s) \ -static inline RETURN_TYPE in##s(unsigned short port) \ +} \ + \ +static inline unsigned type in##bwl##_p(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; \ - } \ - __IN1(s##_p) __IN2(s, s1, "w") : "=a" (_v) : "Nd" (port), ##i); \ - 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) \ + 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 ; 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) \ + 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 ; outs" #s \ - : "=S" (addr), "=c" (count) \ - : "d" (port), "0" (addr), "1" (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 */
Signature · 1 line
1.6.6
[tip:x86/io] x86-64: Use BUILDIO in io_64.h
Commit-ID: 2b4df4d4f7de1a834d252c7da3197fce634cbf0e Gitweb: http://git.kernel.org/tip/2b4df4d4f7de1a834d252c7da3197fce634cbf0e Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:06 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:24 -0800
x86-64: Use BUILDIO in io_64.h
Copied from io_32.h.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_64.h | 112 ++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 75 deletions(-)
arch/x86/include/asm/io_64.h +37 -75
@@ -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)); \ - } \ - __OUT1(s##_p, 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)); \ +} \ + \ +static inline unsigned type in##bwl(int port) \ +{ \ + unsigned type value; \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ + : "=a"(value) : "Nd"(port)); \ + return value; \ +} \ + \ +static inline void out##bwl##_p(unsigned type value, int port) \ +{ \ + out##bwl(value, port); \ slow_down_io(); \ -} - -#define __IN1 (s) \ -static inline RETURN_TYPE in##s(unsigned short port) \ +} \ + \ +static inline unsigned type in##bwl##_p(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; \ - } \ - __IN1(s##_p) __IN2(s, s1, "w") : "=a" (_v) : "Nd" (port), ##i); \ - 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) \ + 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 ; 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) \ + 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 ; outs" #s \ - : "=S" (addr), "=c" (count) \ - : "d" (port), "0" (addr), "1" (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 */
PATCH 5/7 x86: Clean up mem*io functions.
In reply to Brian GerstIomem has no special significance on x86. Use the standard mem* functions instead of trying to call other versions. Some fixups are needed to match the function prototypes.
--- arch/x86/boot/compressed/misc.c | 13 ++++--------- arch/x86/include/asm/io_32.h | 10 +++++----- arch/x86/include/asm/io_64.h | 22 +++++++++++++--------- arch/x86/lib/Makefile | 2 +- arch/x86/lib/io_64.c | 25 ------------------------- 5 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 arch/x86/lib/io_64.c
arch/x86/boot/compressed/misc.c +4 -9
@@ -19,11 +19,6 @@#define _ASM_X86_DESC_H 1#endif -#ifdef CONFIG_X86_64 -#define _LINUX_STRING_H_ 1 -#define __LINUX_BITMAP_H 1 -#endif -#include <linux/linkage.h> #include <linux/screen_info.h> #include <linux/elf.h>
@@ -131,8 +126,8 @@ static void error(char *m);static struct boot_params *real_mode;/* Pointer to real-mode data */ static int quiet; -static void *memset (void *s,int c,unsigned n); -void *memcpy (void *dest,const void *src,unsigned n); +void *memset (void *s,int c,size_t n); +void *memcpy (void *dest,const void *src,size_t n);static void __putstr (int ,const char *);#define putstr (__x) __putstr(0, __x)
@@ -223,7 +218,7 @@ static void __putstr(int error, const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } -static void *memset (void *s,int c,unsigned n) +void *memset (void *s,int c,size_t n) {int i;char *ss = s;
@@ -233,7 +228,7 @@ static void *memset(void *s, int c, unsigned n)return s; } -void *memcpy (void *dest,const void *src,unsigned n) +void *memcpy (void *dest,const void *src,size_t n) {int i;const char *s = src;
arch/x86/include/asm/io_32.h +5 -5
@@ -49,21 +49,21 @@#define xlate_dev_kmem_ptr (p) pstatic inline void -memset_io (volatile void __iomem *addr,unsigned char val,int count) +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) {memset ((void __force *)addr, val, count); }static inline void -memcpy_fromio (void *dst,const volatile void __iomem *src,int count) +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) { -__memcpy (dst, (const void __force *)src, count); +memcpy (dst, (const void __force *)src, count); }static inline void -memcpy_toio (volatile void __iomem *dst,const void *src,int count) +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) { -__memcpy ((void __force *)dst, src, count); +memcpy ((void __force *)dst, src, count); }/*
arch/x86/include/asm/io_64.h +13 -9
@@ -1,6 +1,8 @@#ifndef _ASM_X86_IO_64_H#define _ASM_X86_IO_64_H +#include <linux/string.h> +#include <linux/compiler.h> /* * This file contains the definitions for the x86 IO instructions
@@ -46,20 +48,22 @@*/ #define xlate_dev_kmem_ptr (p) p -void memset_io (volatile void __iomem *a,int b,size_t c); +static inline void +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) +{ +memset ((void __force *)addr, val, count); +} -void __memcpy_fromio (void *,unsigned long ,unsigned ); -static inline void memcpy_fromio (void *to,const volatile void __iomem *from, -unsigned len) +static inline void +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) { -__memcpy_fromio (to, (unsigned long )from, len); +memcpy (dst, (const void __force *)src, count); } -void __memcpy_toio (unsigned long ,const void *,unsigned ); -static inline void memcpy_toio (volatile void __iomem *to,const void *from, -unsigned len) +static inline void +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) { -__memcpy_toio ((unsigned long )to, from, len); +memcpy ((void __force *)dst, src, count); }/*
arch/x86/lib/Makefile +1 -1
@@ -34,7 +34,7 @@ ifneq ($(CONFIG_X86_CMPXCHG64),y) endif lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else - obj-y += io_64.o iomap_copy_64.o + obj-y += iomap_copy_64.o lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o lib-y += thunk_64.o clear_page_64.o copy_page_64.o lib-y += memmove_64.o memset_64.o
arch/x86/lib/io_64.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <linux/string.h> -#include <linux/module.h> -#include <asm/io.h> - -void __memcpy_toio (unsigned long dst,const void *src,unsigned len) -{ -__inline_memcpy ((void *)dst, src, len); -} -EXPORT_SYMBOL (__memcpy_toio); - -void __memcpy_fromio (void *dst,unsigned long src,unsigned len) -{ -__inline_memcpy (dst, (const void *)src, len); -} -EXPORT_SYMBOL (__memcpy_fromio); - -void memset_io (volatile void __iomem *a,int b,size_t c) -{ -/* -* TODO: memset can mangle the IO patterns quite a bit. -* perhaps it would be better to use a dumb one: -*/ -memset ((void *)a, b, c); -} -EXPORT_SYMBOL (memset_io);
Signature · 1 line
1.6.6
[tip:x86/io] x86: Clean up mem*io functions.
Commit-ID: 6175ddf06b6172046a329e3abfd9c901a43efd2e Gitweb: http://git.kernel.org/tip/6175ddf06b6172046a329e3abfd9c901a43efd2e Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:07 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:33 -0800
x86: Clean up mem*io functions.
Iomem has no special significance on x86. Use the standard mem* functions instead of trying to call other versions. Some fixups are needed to match the function prototypes.
LKML-Reference: <[email protected]>
--- arch/x86/boot/compressed/misc.c | 13 ++++--------- arch/x86/include/asm/io_32.h | 10 +++++----- arch/x86/include/asm/io_64.h | 22 +++++++++++++--------- arch/x86/lib/Makefile | 2 +- arch/x86/lib/io_64.c | 25 ------------------------- 5 files changed, 23 insertions(+), 49 deletions(-)
arch/x86/boot/compressed/misc.c +4 -9
@@ -19,11 +19,6 @@#define _ASM_X86_DESC_H 1#endif -#ifdef CONFIG_X86_64 -#define _LINUX_STRING_H_ 1 -#define __LINUX_BITMAP_H 1 -#endif -#include <linux/linkage.h> #include <linux/screen_info.h> #include <linux/elf.h>
@@ -131,8 +126,8 @@ static void error(char *m);static struct boot_params *real_mode;/* Pointer to real-mode data */ static int quiet; -static void *memset (void *s,int c,unsigned n); -void *memcpy (void *dest,const void *src,unsigned n); +void *memset (void *s,int c,size_t n); +void *memcpy (void *dest,const void *src,size_t n);static void __putstr (int ,const char *);#define putstr (__x) __putstr(0, __x)
@@ -223,7 +218,7 @@ static void __putstr(int error, const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } -static void *memset (void *s,int c,unsigned n) +void *memset (void *s,int c,size_t n) {int i;char *ss = s;
@@ -233,7 +228,7 @@ static void *memset(void *s, int c, unsigned n)return s; } -void *memcpy (void *dest,const void *src,unsigned n) +void *memcpy (void *dest,const void *src,size_t n) {int i;const char *s = src;
arch/x86/include/asm/io_32.h +5 -5
@@ -49,21 +49,21 @@#define xlate_dev_kmem_ptr (p) pstatic inline void -memset_io (volatile void __iomem *addr,unsigned char val,int count) +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) {memset ((void __force *)addr, val, count); }static inline void -memcpy_fromio (void *dst,const volatile void __iomem *src,int count) +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) { -__memcpy (dst, (const void __force *)src, count); +memcpy (dst, (const void __force *)src, count); }static inline void -memcpy_toio (volatile void __iomem *dst,const void *src,int count) +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) { -__memcpy ((void __force *)dst, src, count); +memcpy ((void __force *)dst, src, count); }/*
arch/x86/include/asm/io_64.h +13 -9
@@ -1,6 +1,8 @@#ifndef _ASM_X86_IO_64_H#define _ASM_X86_IO_64_H +#include <linux/string.h> +#include <linux/compiler.h> /* * This file contains the definitions for the x86 IO instructions
@@ -46,20 +48,22 @@*/ #define xlate_dev_kmem_ptr (p) p -void memset_io (volatile void __iomem *a,int b,size_t c); +static inline void +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) +{ +memset ((void __force *)addr, val, count); +} -void __memcpy_fromio (void *,unsigned long ,unsigned ); -static inline void memcpy_fromio (void *to,const volatile void __iomem *from, -unsigned len) +static inline void +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) { -__memcpy_fromio (to, (unsigned long )from, len); +memcpy (dst, (const void __force *)src, count); } -void __memcpy_toio (unsigned long ,const void *,unsigned ); -static inline void memcpy_toio (volatile void __iomem *to,const void *from, -unsigned len) +static inline void +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) { -__memcpy_toio ((unsigned long )to, from, len); +memcpy ((void __force *)dst, src, count); }/*
arch/x86/lib/Makefile +1 -1
@@ -34,7 +34,7 @@ ifneq ($(CONFIG_X86_CMPXCHG64),y) endif lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else - obj-y += io_64.o iomap_copy_64.o + obj-y += iomap_copy_64.o lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o lib-y += thunk_64.o clear_page_64.o copy_page_64.o lib-y += memmove_64.o memset_64.o
arch/x86/lib/io_64.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <linux/string.h> -#include <linux/module.h> -#include <asm/io.h> - -void __memcpy_toio (unsigned long dst,const void *src,unsigned len) -{ -__inline_memcpy ((void *)dst, src, len); -} -EXPORT_SYMBOL (__memcpy_toio); - -void __memcpy_fromio (void *dst,unsigned long src,unsigned len) -{ -__inline_memcpy (dst, (const void *)src, len); -} -EXPORT_SYMBOL (__memcpy_fromio); - -void memset_io (volatile void __iomem *a,int b,size_t c) -{ -/* -* TODO: memset can mangle the IO patterns quite a bit. -* perhaps it would be better to use a dumb one: -*/ -memset ((void *)a, b, c); -} -EXPORT_SYMBOL (memset_io);
PATCH 6/7 x86: Simplify flush_write_buffers()
In reply to Brian GerstAlways make it an inline instead of using a macro for the no-op case.
--- arch/x86/include/asm/io_32.h | 10 ++-------- arch/x86/include/asm/io_64.h | 8 +++++++- 2 files changed, 9 insertions(+), 9 deletions(-)
arch/x86/include/asm/io_32.h +2 -8
@@ -84,18 +84,12 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)* 2. Accidentally out of order processors (PPro errata #51) */ -#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) -static inline void flush_write_buffers (void ) { +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); -} - -#else - -#define flush_write_buffers () do { } while (0) -#endif +}#endif /* __KERNEL__ */
arch/x86/include/asm/io_64.h +7 -1
@@ -83,7 +83,13 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)* 1. Out of order aware processors * 2. Accidentally out of order processors (PPro errata #51) */ -#define flush_write_buffers () do { } while (0) + +static inline void flush_write_buffers (void ) +{ +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) + asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); +#endif +}#endif /* __KERNEL__ */
Signature · 1 line
1.6.6
[tip:x86/io] x86: Simplify flush_write_buffers()
Commit-ID: 910bf6ad0be3e1efbda0e9d358794937b52c9860 Gitweb: http://git.kernel.org/tip/910bf6ad0be3e1efbda0e9d358794937b52c9860 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:08 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:38 -0800
x86: Simplify flush_write_buffers()
Always make it an inline instead of using a macro for the no-op case.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_32.h | 10 ++-------- arch/x86/include/asm/io_64.h | 8 +++++++- 2 files changed, 9 insertions(+), 9 deletions(-)
arch/x86/include/asm/io_32.h +2 -8
@@ -84,18 +84,12 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)* 2. Accidentally out of order processors (PPro errata #51) */ -#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) -static inline void flush_write_buffers (void ) { +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); -} - -#else - -#define flush_write_buffers () do { } while (0) -#endif +}#endif /* __KERNEL__ */
arch/x86/include/asm/io_64.h +7 -1
@@ -83,7 +83,13 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)* 1. Out of order aware processors * 2. Accidentally out of order processors (PPro errata #51) */ -#define flush_write_buffers () do { } while (0) + +static inline void flush_write_buffers (void ) +{ +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) + asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); +#endif +}#endif /* __KERNEL__ */
PATCH 7/7 x86: Merge io.h
In reply to Brian Gerstio_32.h and io_64.h are now identical. Merge them into io.h.
--- arch/x86/include/asm/io.h | 155 +++++++++++++++++++++++++++++++++++++++- arch/x86/include/asm/io_32.h | 161 ------------------------------------------ arch/x86/include/asm/io_64.h | 161 ------------------------------------------ 3 files changed, 152 insertions(+), 325 deletions(-) delete mode 100644 arch/x86/include/asm/io_32.h delete mode 100644 arch/x86/include/asm/io_64.h
arch/x86/include/asm/io.h +152 -3
@@ -1,8 +1,42 @@#ifndef _ASM_X86_IO_H#define _ASM_X86_IO_H +/* +* This file contains the definitions for the x86 IO instructions +* inb/inw/inl/outb/outw/outl and the "string versions" of the same +* (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing" +* versions of the single-IO instructions (inb_p/inw_p/..). +* +* This file is not meant to be obfuscating: it's just complicated +* to (a) handle it all in a way that makes gcc able to optimize it +* as well as possible and (b) trying to avoid writing the same thing +* over and over again with slight variations and possibly making a +* mistake somewhere. +*/ + +/* +* Thanks to James van Artsdalen for a better timing-fix than +* the two short jumps: using outb's to a nonexistent port seems +* to guarantee better timings even on fast machines. +* +* On the other hand, I'd like to be sure of a non-existent port: +* I feel a bit unsafe about using 0x80 (should be safe, though) +* +* Linus +*/ + +/* +* Bit simplified and optimized by Jan Hubicka +* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999. +* +* isa_memset_io, isa_memcpy_fromio, isa_memcpy_toio added, +* isa_read[wl] and isa_write[wl] fixed +* - Arnaldo Carvalho de Melo <[email protected]> +*/ +#define ARCH_HAS_IOREMAP_WC +#include <linux/string.h> #include <linux/compiler.h> #include <asm-generic/int-ll64.h> #include <asm/page.h>
@@ -173,11 +207,126 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)extern void iounmap (volatile void __iomem *addr); -#ifdef CONFIG_X86_32 -# include "io_32.h" +#ifdef __KERNEL__ + +#include <asm-generic/iomap.h> + +#include <linux/vmalloc.h> + +/* +* Convert a virtual cached pointer to an uncached pointer +*/ +#define xlate_dev_kmem_ptr (p) p + +static inline void +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) +{ +memset ((void __force *)addr, val, count); +} + +static inline void +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) +{ +memcpy (dst, (const void __force *)src, count); +} + +static inline void +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) +{ +memcpy ((void __force *)dst, src, count); +} + +/* +* ISA space is 'always mapped' on a typical x86 system, no need to +* explicitly ioremap() it. The fact that the ISA IO space is mapped +* to PAGE_OFFSET is pure coincidence - it does not mean ISA values +* are physical addresses. The following constant pointer can be +* used as the IO-area pointer (it can be iounmapped as well, so the +* analogy with PCI is quite large): +*/ +#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) + +/* +* Cache management +* +* This needed for two cases +* 1. Out of order aware processors +* 2. Accidentally out of order processors (PPro errata #51) +*/ + +static inline void flush_write_buffers (void ) +{ +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) + asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); +#endif +} + +#endif /* __KERNEL__ */ + +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 -# include "io_64.h" + +static inline void slow_down_io (void ) +{ +native_io_delay (); +#ifdef REALLY_SLOW_IO +native_io_delay (); +native_io_delay (); +native_io_delay ();#endif +} + +#endif + +#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)); \ +} \ + \ +static inline unsigned type in##bwl(int port) \ +{ \ + unsigned type value; \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ + : "=a"(value) : "Nd"(port)); \ + return value; \ +} \ + \ +static inline void out##bwl##_p(unsigned type value, int port) \ +{ \ + out##bwl(value, port); \ + slow_down_io(); \ +} \ + \ +static inline unsigned type in##bwl##_p(int port) \ +{ \ + 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" #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)); \ +} + +BUILDIO(b, b, char) +BUILDIO(w, w, short) +BUILDIO(l, , int)extern void *xlate_dev_mem_ptr (unsigned long phys);extern void unxlate_dev_mem_ptr (unsigned long phys,void *addr);
arch/x86/include/asm/io_32.h deleted +0 -161
161 lines not on this page · raw message
arch/x86/include/asm/io_64.h deleted +0 -161
161 lines not on this page · raw message
Signature · 1 line
1.6.6
[tip:x86/io] x86: Merge io.h
Commit-ID: 1c5b9069e12e20d2fe883076ae0bf73966492108 Gitweb: http://git.kernel.org/tip/1c5b9069e12e20d2fe883076ae0bf73966492108 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 5 Feb 2010 09:37:09 -0500 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 13:57:40 -0800
x86: Merge io.h
io_32.h and io_64.h are now identical. Merge them into io.h.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io.h | 155 +++++++++++++++++++++++++++++++++++++++- arch/x86/include/asm/io_32.h | 161 ------------------------------------------ arch/x86/include/asm/io_64.h | 161 ------------------------------------------ 3 files changed, 152 insertions(+), 325 deletions(-)
arch/x86/include/asm/io.h +152 -3
@@ -1,8 +1,42 @@#ifndef _ASM_X86_IO_H#define _ASM_X86_IO_H +/* +* This file contains the definitions for the x86 IO instructions +* inb/inw/inl/outb/outw/outl and the "string versions" of the same +* (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing" +* versions of the single-IO instructions (inb_p/inw_p/..). +* +* This file is not meant to be obfuscating: it's just complicated +* to (a) handle it all in a way that makes gcc able to optimize it +* as well as possible and (b) trying to avoid writing the same thing +* over and over again with slight variations and possibly making a +* mistake somewhere. +*/ + +/* +* Thanks to James van Artsdalen for a better timing-fix than +* the two short jumps: using outb's to a nonexistent port seems +* to guarantee better timings even on fast machines. +* +* On the other hand, I'd like to be sure of a non-existent port: +* I feel a bit unsafe about using 0x80 (should be safe, though) +* +* Linus +*/ + +/* +* Bit simplified and optimized by Jan Hubicka +* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999. +* +* isa_memset_io, isa_memcpy_fromio, isa_memcpy_toio added, +* isa_read[wl] and isa_write[wl] fixed +* - Arnaldo Carvalho de Melo <[email protected]> +*/ +#define ARCH_HAS_IOREMAP_WC +#include <linux/string.h> #include <linux/compiler.h> #include <asm-generic/int-ll64.h> #include <asm/page.h>
@@ -173,11 +207,126 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)extern void iounmap (volatile void __iomem *addr); -#ifdef CONFIG_X86_32 -# include "io_32.h" +#ifdef __KERNEL__ + +#include <asm-generic/iomap.h> + +#include <linux/vmalloc.h> + +/* +* Convert a virtual cached pointer to an uncached pointer +*/ +#define xlate_dev_kmem_ptr (p) p + +static inline void +memset_io (volatile void __iomem *addr,unsigned char val,size_t count) +{ +memset ((void __force *)addr, val, count); +} + +static inline void +memcpy_fromio (void *dst,const volatile void __iomem *src,size_t count) +{ +memcpy (dst, (const void __force *)src, count); +} + +static inline void +memcpy_toio (volatile void __iomem *dst,const void *src,size_t count) +{ +memcpy ((void __force *)dst, src, count); +} + +/* +* ISA space is 'always mapped' on a typical x86 system, no need to +* explicitly ioremap() it. The fact that the ISA IO space is mapped +* to PAGE_OFFSET is pure coincidence - it does not mean ISA values +* are physical addresses. The following constant pointer can be +* used as the IO-area pointer (it can be iounmapped as well, so the +* analogy with PCI is quite large): +*/ +#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) + +/* +* Cache management +* +* This needed for two cases +* 1. Out of order aware processors +* 2. Accidentally out of order processors (PPro errata #51) +*/ + +static inline void flush_write_buffers (void ) +{ +#if defined(CONFIG_X86_OOSTORE ) || defined(CONFIG_X86_PPRO_FENCE ) + asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); +#endif +} + +#endif /* __KERNEL__ */ + +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 -# include "io_64.h" + +static inline void slow_down_io (void ) +{ +native_io_delay (); +#ifdef REALLY_SLOW_IO +native_io_delay (); +native_io_delay (); +native_io_delay ();#endif +} + +#endif + +#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)); \ +} \ + \ +static inline unsigned type in##bwl(int port) \ +{ \ + unsigned type value; \ + asm volatile("in" #bwl " %w1, %" #bw "0" \ + : "=a"(value) : "Nd"(port)); \ + return value; \ +} \ + \ +static inline void out##bwl##_p(unsigned type value, int port) \ +{ \ + out##bwl(value, port); \ + slow_down_io(); \ +} \ + \ +static inline unsigned type in##bwl##_p(int port) \ +{ \ + 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" #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)); \ +} + +BUILDIO(b, b, char) +BUILDIO(w, w, short) +BUILDIO(l, , int)extern void *xlate_dev_mem_ptr (unsigned long phys);extern void unxlate_dev_mem_ptr (unsigned long phys,void *addr);
arch/x86/include/asm/io_32.h deleted +0 -161
161 lines not on this page · raw message
arch/x86/include/asm/io_64.h deleted +0 -161
161 lines not on this page · raw message