nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

MIPS: Modify core io.h macros to account for the Octeon Errata Core-301.

Browse source 
Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney 2008-12-11 15:33:29 -08:00 committed by Ralf Baechle
parent 7e69deb83c
commit 8faca49a67
1 changed files with 14 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
arch/mips/include/asm/io.h
View file

@ -295,6 +295,12 @@ static inline void iounmap(const volatile void __iomem *addr)
#undef __IS_KSEG1 #undef __IS_KSEG1
} }
#ifdef CONFIG_CPU_CAVIUM_OCTEON
#define war_octeon_io_reorder_wmb() wmb()
#else
#define war_octeon_io_reorder_wmb() do { } while (0)
#endif
#define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, irq) \ #define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, irq) \
\ \
static inline void pfx##write##bwlq(type val, \ static inline void pfx##write##bwlq(type val, \
@ -303,6 +309,8 @@ static inline void pfx##write##bwlq(type val, \
volatile type *__mem; \ volatile type *__mem; \
type __val; \ type __val; \
\ \
war_octeon_io_reorder_wmb(); \
\
__mem = (void *)__swizzle_addr_##bwlq((unsigned long)(mem)); \ __mem = (void *)__swizzle_addr_##bwlq((unsigned long)(mem)); \
\ \
__val = pfx##ioswab##bwlq(__mem, val); \ __val = pfx##ioswab##bwlq(__mem, val); \
@ -370,6 +378,8 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \
volatile type *__addr; \ volatile type *__addr; \
type __val; \ type __val; \
\ \
war_octeon_io_reorder_wmb(); \
\
__addr = (void *)__swizzle_addr_##bwlq(mips_io_port_base + port); \ __addr = (void *)__swizzle_addr_##bwlq(mips_io_port_base + port); \
\ \
__val = pfx##ioswab##bwlq(__addr, val); \ __val = pfx##ioswab##bwlq(__addr, val); \
@ -504,8 +514,12 @@ BUILDSTRING(q, u64)
#endif #endif
#ifdef CONFIG_CPU_CAVIUM_OCTEON
#define mmiowb() wmb()
#else
/* Depends on MIPS II instruction set */ /* Depends on MIPS II instruction set */
#define mmiowb() asm volatile ("sync" ::: "memory") #define mmiowb() asm volatile ("sync" ::: "memory")
#endif
static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
{ {