korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 17:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: Provide actually relaxed MMIO accessors

Browse Source 
Improve performance for the relevant systems and remove the DMA ordering
barrier from `readX_relaxed' and `writeX_relaxed' MMIO accessors, where
it is not needed according to our requirements[1].  For consistency make
the same arrangement with low-level port I/O accessors, but do not
actually provide any accessors making use of it.

References:

[1] "LINUX KERNEL MEMORY BARRIERS", Documentation/memory-barriers.txt,
    Section "KERNEL I/O BARRIER EFFECTS"

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20865/
Cc: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Maciej W. Rozycki 2018-10-08 01:37:23 +01:00 committed by Paul Burton
parent 3d474dacae
commit 8b656253a7
No known key found for this signature in database
GPG Key ID: 3EA79FACB57500DD
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/mips/include/asm/io.h
View File

@ -46,6 +46,11 @@
# define __raw_ioswabq(a, x) (x) # define __raw_ioswabq(a, x) (x)
# define ____raw_ioswabq(a, x) (x) # define ____raw_ioswabq(a, x) (x)
# define __relaxed_ioswabb ioswabb
# define __relaxed_ioswabw ioswabw
# define __relaxed_ioswabl ioswabl
# define __relaxed_ioswabq ioswabq
/* ioswab[bwlq], __mem_ioswab[bwlq] are defined in mangle-port.h */ /* ioswab[bwlq], __mem_ioswab[bwlq] are defined in mangle-port.h */
#define IO_SPACE_LIMIT 0xffff #define IO_SPACE_LIMIT 0xffff
@ -311,7 +316,7 @@ static inline void iounmap(const volatile void __iomem *addr)
#define war_io_reorder_wmb() barrier() #define war_io_reorder_wmb() barrier()
#endif #endif
#define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, barrier, irq) \ #define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, barrier, relax, irq) \
\ \
static inline void pfx##write##bwlq(type val, \ static inline void pfx##write##bwlq(type val, \
volatile void __iomem *mem) \ volatile void __iomem *mem) \
@ -385,11 +390,12 @@ static inline type pfx##read##bwlq(const volatile void __iomem *mem) \
} \ } \
\ \
/* prevent prefetching of coherent DMA data prematurely */ \ /* prevent prefetching of coherent DMA data prematurely */ \
rmb(); \ if (!relax) \
rmb(); \
return pfx##ioswab##bwlq(__mem, __val); \ return pfx##ioswab##bwlq(__mem, __val); \
} }
#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, barrier, p) \ #define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, barrier, relax, p) \
\ \
static inline void pfx##out##bwlq##p(type val, unsigned long port) \ static inline void pfx##out##bwlq##p(type val, unsigned long port) \
{ \ { \
@ -426,19 +432,21 @@ static inline type pfx##in##bwlq##p(unsigned long port) \
__val = *__addr; \ __val = *__addr; \
\ \
/* prevent prefetching of coherent DMA data prematurely */ \ /* prevent prefetching of coherent DMA data prematurely */ \
rmb(); \ if (!relax) \
rmb(); \
return pfx##ioswab##bwlq(__addr, __val); \ return pfx##ioswab##bwlq(__addr, __val); \
} }
#define __BUILD_MEMORY_PFX(bus, bwlq, type) \ #define __BUILD_MEMORY_PFX(bus, bwlq, type, relax) \
\ \
__BUILD_MEMORY_SINGLE(bus, bwlq, type, 1, 1) __BUILD_MEMORY_SINGLE(bus, bwlq, type, 1, relax, 1)
#define BUILDIO_MEM(bwlq, type) \ #define BUILDIO_MEM(bwlq, type) \
\ \
__BUILD_MEMORY_PFX(__raw_, bwlq, type) \ __BUILD_MEMORY_PFX(__raw_, bwlq, type, 0) \
__BUILD_MEMORY_PFX(, bwlq, type) \ __BUILD_MEMORY_PFX(__relaxed_, bwlq, type, 1) \
__BUILD_MEMORY_PFX(__mem_, bwlq, type) \ __BUILD_MEMORY_PFX(__mem_, bwlq, type, 0) \
__BUILD_MEMORY_PFX(, bwlq, type, 0)
BUILDIO_MEM(b, u8) BUILDIO_MEM(b, u8)
BUILDIO_MEM(w, u16) BUILDIO_MEM(w, u16)
@ -446,8 +454,8 @@ BUILDIO_MEM(l, u32)
BUILDIO_MEM(q, u64) BUILDIO_MEM(q, u64)
#define __BUILD_IOPORT_PFX(bus, bwlq, type) \ #define __BUILD_IOPORT_PFX(bus, bwlq, type) \
__BUILD_IOPORT_SINGLE(bus, bwlq, type, 1,) \ __BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0,) \
__BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, _p) __BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0, _p)
#define BUILDIO_IOPORT(bwlq, type) \ #define BUILDIO_IOPORT(bwlq, type) \
__BUILD_IOPORT_PFX(, bwlq, type) \ __BUILD_IOPORT_PFX(, bwlq, type) \
@ -462,19 +470,19 @@ BUILDIO_IOPORT(q, u64)
#define __BUILDIO(bwlq, type) \ #define __BUILDIO(bwlq, type) \
\ \
__BUILD_MEMORY_SINGLE(____raw_, bwlq, type, 1, 0) __BUILD_MEMORY_SINGLE(____raw_, bwlq, type, 1, 0, 0)
__BUILDIO(q, u64) __BUILDIO(q, u64)
#define readb_relaxed readb #define readb_relaxed __relaxed_readb
#define readw_relaxed readw #define readw_relaxed __relaxed_readw
#define readl_relaxed readl #define readl_relaxed __relaxed_readl
#define readq_relaxed readq #define readq_relaxed __relaxed_readq
#define writeb_relaxed writeb #define writeb_relaxed __relaxed_writeb
#define writew_relaxed writew #define writew_relaxed __relaxed_writew
#define writel_relaxed writel #define writel_relaxed __relaxed_writel
#define writeq_relaxed writeq #define writeq_relaxed __relaxed_writeq
#define readb_be(addr) \ #define readb_be(addr) \
__raw_readb((__force unsigned *)(addr)) __raw_readb((__force unsigned *)(addr))