powerpc: Fix __raw* accessors
PATCH 1/1 powerpc: Fix __raw* accessors
The new IO accessor code allows to stick a token in the top bit of MMIO addresses which gets masked out during actual accesses. However, the __raw_* accessors forgot to mask it out. This fixes it.
include/asm-powerpc/io.h +45 -47
@@ -185,53 +185,6 @@ extern void _memcpy_toio(volatile void _* of the accessors. */ - -/* -* Non ordered and non-swapping "raw" accessors -*/ - -static inline unsigned char __raw_readb (const volatile void __iomem *addr) -{ -return *(volatile unsigned char __force *)addr; -} -static inline unsigned short __raw_readw (const volatile void __iomem *addr) -{ -return *(volatile unsigned short __force *)addr; -} -static inline unsigned int __raw_readl (const volatile void __iomem *addr) -{ -return *(volatile unsigned int __force *)addr; -} -static inline void __raw_writeb (unsigned char v,volatile void __iomem *addr) -{ - *(volatile unsigned char __force *)addr = v; -} -static inline void __raw_writew (unsigned short v,volatile void __iomem *addr) -{ - *(volatile unsigned short __force *)addr = v; -} -static inline void __raw_writel (unsigned int v,volatile void __iomem *addr) -{ - *(volatile unsigned int __force *)addr = v; -} - -#ifdef __powerpc64__ -static inline unsigned long __raw_readq (const volatile void __iomem *addr) -{ -return *(volatile unsigned long __force *)addr; -} -static inline void __raw_writeq (unsigned long v,volatile void __iomem *addr) -{ - *(volatile unsigned long __force *)addr = v; -} -#endif /* __powerpc64__ */ - -/* -* -* PCI PIO and MMIO accessors. -* -*/ -/* * Include the EEH definitions when EEH is enabled only so they don't get * in the way when building for 32 bits
@@ -291,7 +244,52 @@ do { \#define PCI_FIX_ADDR (addr) (addr)#endif + +/* +* Non ordered and non-swapping "raw" accessors +*/ + +static inline unsigned char __raw_readb (const volatile void __iomem *addr) +{ +return *(volatile unsigned char __force *)PCI_FIX_ADDR (addr); +} +static inline unsigned short __raw_readw (const volatile void __iomem *addr) +{ +return *(volatile unsigned short __force *)PCI_FIX_ADDR (addr); +} +static inline unsigned int __raw_readl (const volatile void __iomem *addr) +{ +return *(volatile unsigned int __force *)PCI_FIX_ADDR (addr); +} +static inline void __raw_writeb (unsigned char v,volatile void __iomem *addr) +{ + *(volatile unsigned char __force *)PCI_FIX_ADDR (addr) = v; +} +static inline void __raw_writew (unsigned short v,volatile void __iomem *addr) +{ + *(volatile unsigned short __force *)PCI_FIX_ADDR (addr) = v; +} +static inline void __raw_writel (unsigned int v,volatile void __iomem *addr) +{ + *(volatile unsigned int __force *)PCI_FIX_ADDR (addr) = v; +} + +#ifdef __powerpc64__ +static inline unsigned long __raw_readq (const volatile void __iomem *addr) +{ +return *(volatile unsigned long __force *)PCI_FIX_ADDR (addr); +} +static inline void __raw_writeq (unsigned long v,volatile void __iomem *addr) +{ + *(volatile unsigned long __force *)PCI_FIX_ADDR (addr) = v; +} +#endif /* __powerpc64__ */ +/* +* +* PCI PIO and MMIO accessors. +* +* * On 32 bits, PIO operations have a recovery mechanism in case they trigger * machine checks (which they occasionally do when probing non existing * IO ports on some platforms, like PowerMac and 8xx).
Quoted 3 lines · Benjamin Herrenschmidt
The new IO accessor code allows to stick a token in the top bit of MMIO addresses which gets masked out during actual accesses. However, the __raw_* accessors forgot to mask it out. This fixes it.
Jens, you debugged the problem originally. Does this patch fix it entirely, or is there something else missing?
Arnd <><
Quoted 7 lines · Arnd Bergmann
Quoted 3 lines · Benjamin Herrenschmidt
The new IO accessor code allows to stick a token in the top bit of MMIO addresses which gets masked out during actual accesses. However, the __raw_* accessors forgot to mask it out. This fixes it.
Jens, you debugged the problem originally. Does this patch fix it entirely, or is there something else missing?
The driver basically works, but I am seeing strange im_free messages, probably because this code is not aware of the tokens in the ioremapped addresses.
<6>ib_mthca: Mellanox InfiniBand HCA driver v0.08 (February 14, 2006) <6>ib_mthca: Initializing 0002:00:00.0
<3>Trying to im_free nonexistent area (d002080080930000) <6>ib_mthca: Initializing 0004:00:00.0
<3>Trying to im_free nonexistent area (d003080082a37000) <4>ib_mthca 0004:00:00.0: HCA FW version 4.6.0 is old (4.7.600 is current). <4>ib_mthca 0004:00:00.0: If you have problems, try updating your HCA FW.
Jens
Quoted 6 lines · Jens Osterkamp
Quoted 5 lines · Arnd Bergmann
Quoted 3 lines · Benjamin Herrenschmidt
The new IO accessor code allows to stick a token in the top bit of MMIO addresses which gets masked out during actual accesses. However, the __raw_* accessors forgot to mask it out. This fixes it.
Quoted 6 lines
Quoted 2 lines
Jens, you debugged the problem originally. Does this patch fix it entirely, or is there something else missing?
The driver basically works, but I am seeing strange
im_freemessages, probably because this code is not aware of the tokens in the ioremapped addresses.
Or becasue ioumap isn't properly masking out the token... I'll check that.
Ben.
Quoted 9 lines
<6>ib_mthca: Mellanox InfiniBand HCA driver v0.08 (February 14, 2006) <6>ib_mthca: Initializing 0002:00:00.0
<3>Trying toim_freenonexistent area (d002080080930000) <6>ib_mthca: Initializing 0004:00:00.0
<3>Trying toim_freenonexistent area (d003080082a37000) <4>ib_mthca 0004:00:00.0: HCA FW version 4.6.0 is old (4.7.600 is current). <4>ib_mthca 0004:00:00.0: If you have problems, try updating your HCA FW.Jens