Skip to content

L
linux
Commit 3b57edfa authored by David Gibson's avatar David Gibson Committed by Linus Torvalds
Browse files
Options

[PATCH] ppc64: EEH checks mistakenly became no-ops 

Recent changes which removed the use of IO tokens for EEH enabled devices
had a bug, which mean we now never do EEH checks at all.

This patch corrects the problem.
Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6e16edca
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 31 deletions
include/asm-ppc64/eeh.h
View file @ 3b57edfa
...@@ -71,16 +71,10 @@ int eeh_set_option(struct pci_dev *dev, int options); ...@@ -71,16 +71,10 @@ int eeh_set_option(struct pci_dev *dev, int options);
/* /*
* EEH_POSSIBLE_ERROR() -- test for possible MMIO failure. * EEH_POSSIBLE_ERROR() -- test for possible MMIO failure.
* *
* Order this macro for performance.
* If EEH is off for a device and it is a memory BAR, ioremap will
* map it to the IOREGION. In this case addr == vaddr and since these
* should be in registers we compare them first. Next we check for
* ff's which indicates a (very) possible failure.
*
* If this macro yields TRUE, the caller relays to eeh_check_failure() * If this macro yields TRUE, the caller relays to eeh_check_failure()
* which does further tests out of line. * which does further tests out of line.
*/ */
#define EEH_POSSIBLE_IO_ERROR(val, type) ((val) == (type)~0) #define EEH_POSSIBLE_ERROR(val, type) ((val) == (type)~0)
/* /*
* Reads from a device which has been isolated by EEH will return * Reads from a device which has been isolated by EEH will return
...@@ -89,21 +83,13 @@ int eeh_set_option(struct pci_dev *dev, int options); ...@@ -89,21 +83,13 @@ int eeh_set_option(struct pci_dev *dev, int options);
*/ */
#define EEH_IO_ERROR_VALUE(size) (~0U >> ((4 - (size)) * 8)) #define EEH_IO_ERROR_VALUE(size) (~0U >> ((4 - (size)) * 8))
/*
* The vaddr will equal the addr if EEH checking is disabled for
* this device. This is because eeh_ioremap() will not have
* remapped to 0xA0, and thus both vaddr and addr will be 0xE0...
*/
#define EEH_POSSIBLE_ERROR(addr, vaddr, val, type) \
((vaddr) != (addr) && EEH_POSSIBLE_IO_ERROR(val, type))
/* /*
* MMIO read/write operations with EEH support. * MMIO read/write operations with EEH support.
*/ */
static inline u8 eeh_readb(const volatile void __iomem *addr) { static inline u8 eeh_readb(const volatile void __iomem *addr) {
volatile u8 *vaddr = (volatile u8 __force *) addr; volatile u8 *vaddr = (volatile u8 __force *) addr;
u8 val = in_8(vaddr); u8 val = in_8(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u8)) if (EEH_POSSIBLE_ERROR(val, u8))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -115,7 +101,7 @@ static inline void eeh_writeb(u8 val, volatile void __iomem *addr) { ...@@ -115,7 +101,7 @@ static inline void eeh_writeb(u8 val, volatile void __iomem *addr) {
static inline u16 eeh_readw(const volatile void __iomem *addr) { static inline u16 eeh_readw(const volatile void __iomem *addr) {
volatile u16 *vaddr = (volatile u16 __force *) addr; volatile u16 *vaddr = (volatile u16 __force *) addr;
u16 val = in_le16(vaddr); u16 val = in_le16(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u16)) if (EEH_POSSIBLE_ERROR(val, u16))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -126,7 +112,7 @@ static inline void eeh_writew(u16 val, volatile void __iomem *addr) { ...@@ -126,7 +112,7 @@ static inline void eeh_writew(u16 val, volatile void __iomem *addr) {
static inline u16 eeh_raw_readw(const volatile void __iomem *addr) { static inline u16 eeh_raw_readw(const volatile void __iomem *addr) {
volatile u16 *vaddr = (volatile u16 __force *) addr; volatile u16 *vaddr = (volatile u16 __force *) addr;
u16 val = in_be16(vaddr); u16 val = in_be16(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u16)) if (EEH_POSSIBLE_ERROR(val, u16))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -138,7 +124,7 @@ static inline void eeh_raw_writew(u16 val, volatile void __iomem *addr) { ...@@ -138,7 +124,7 @@ static inline void eeh_raw_writew(u16 val, volatile void __iomem *addr) {
static inline u32 eeh_readl(const volatile void __iomem *addr) { static inline u32 eeh_readl(const volatile void __iomem *addr) {
volatile u32 *vaddr = (volatile u32 __force *) addr; volatile u32 *vaddr = (volatile u32 __force *) addr;
u32 val = in_le32(vaddr); u32 val = in_le32(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u32)) if (EEH_POSSIBLE_ERROR(val, u32))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -149,7 +135,7 @@ static inline void eeh_writel(u32 val, volatile void __iomem *addr) { ...@@ -149,7 +135,7 @@ static inline void eeh_writel(u32 val, volatile void __iomem *addr) {
static inline u32 eeh_raw_readl(const volatile void __iomem *addr) { static inline u32 eeh_raw_readl(const volatile void __iomem *addr) {
volatile u32 *vaddr = (volatile u32 __force *) addr; volatile u32 *vaddr = (volatile u32 __force *) addr;
u32 val = in_be32(vaddr); u32 val = in_be32(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u32)) if (EEH_POSSIBLE_ERROR(val, u32))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -161,7 +147,7 @@ static inline void eeh_raw_writel(u32 val, volatile void __iomem *addr) { ...@@ -161,7 +147,7 @@ static inline void eeh_raw_writel(u32 val, volatile void __iomem *addr) {
static inline u64 eeh_readq(const volatile void __iomem *addr) { static inline u64 eeh_readq(const volatile void __iomem *addr) {
volatile u64 *vaddr = (volatile u64 __force *) addr; volatile u64 *vaddr = (volatile u64 __force *) addr;
u64 val = in_le64(vaddr); u64 val = in_le64(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u64)) if (EEH_POSSIBLE_ERROR(val, u64))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -172,7 +158,7 @@ static inline void eeh_writeq(u64 val, volatile void __iomem *addr) { ...@@ -172,7 +158,7 @@ static inline void eeh_writeq(u64 val, volatile void __iomem *addr) {
static inline u64 eeh_raw_readq(const volatile void __iomem *addr) { static inline u64 eeh_raw_readq(const volatile void __iomem *addr) {
volatile u64 *vaddr = (volatile u64 __force *) addr; volatile u64 *vaddr = (volatile u64 __force *) addr;
u64 val = in_be64(vaddr); u64 val = in_be64(vaddr);
if (EEH_POSSIBLE_ERROR(addr, vaddr, val, u64)) if (EEH_POSSIBLE_ERROR(val, u64))
return eeh_check_failure(addr, val); return eeh_check_failure(addr, val);
return val; return val;
} }
...@@ -209,7 +195,7 @@ static inline void eeh_memset_io(volatile void __iomem *addr, int c, unsigned lo ...@@ -209,7 +195,7 @@ static inline void eeh_memset_io(volatile void __iomem *addr, int c, unsigned lo
} }
static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *src, unsigned long n) { static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *src, unsigned long n) {
void *vsrc = (void __force *) src; void *vsrc = (void __force *) src;
void *vsrcsave = vsrc, *destsave = dest; void *destsave = dest;
const volatile void __iomem *srcsave = src; const volatile void __iomem *srcsave = src;
unsigned long nsave = n; unsigned long nsave = n;
...@@ -240,8 +226,7 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr ...@@ -240,8 +226,7 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr
* were copied. Check all four bytes. * were copied. Check all four bytes.
*/ */
if ((nsave >= 4) && if ((nsave >= 4) &&
(EEH_POSSIBLE_ERROR(srcsave, vsrcsave, (*((u32 *) destsave+nsave-4)), (EEH_POSSIBLE_ERROR((*((u32 *) destsave+nsave-4)), u32))) {
u32))) {
eeh_check_failure(srcsave, (*((u32 *) destsave+nsave-4))); eeh_check_failure(srcsave, (*((u32 *) destsave+nsave-4)));
} }
} }
...@@ -281,7 +266,7 @@ static inline u8 eeh_inb(unsigned long port) { ...@@ -281,7 +266,7 @@ static inline u8 eeh_inb(unsigned long port) {
if (!_IO_IS_VALID(port)) if (!_IO_IS_VALID(port))
return ~0; return ~0;
val = in_8((u8 *)(port+pci_io_base)); val = in_8((u8 *)(port+pci_io_base));
if (EEH_POSSIBLE_IO_ERROR(val, u8)) if (EEH_POSSIBLE_ERROR(val, u8))
return eeh_check_failure((void __iomem *)(port), val); return eeh_check_failure((void __iomem *)(port), val);
return val; return val;
} }
...@@ -296,7 +281,7 @@ static inline u16 eeh_inw(unsigned long port) { ...@@ -296,7 +281,7 @@ static inline u16 eeh_inw(unsigned long port) {
if (!_IO_IS_VALID(port)) if (!_IO_IS_VALID(port))
return ~0; return ~0;
val = in_le16((u16 *)(port+pci_io_base)); val = in_le16((u16 *)(port+pci_io_base));
if (EEH_POSSIBLE_IO_ERROR(val, u16)) if (EEH_POSSIBLE_ERROR(val, u16))
return eeh_check_failure((void __iomem *)(port), val); return eeh_check_failure((void __iomem *)(port), val);
return val; return val;
} }
...@@ -311,7 +296,7 @@ static inline u32 eeh_inl(unsigned long port) { ...@@ -311,7 +296,7 @@ static inline u32 eeh_inl(unsigned long port) {
if (!_IO_IS_VALID(port)) if (!_IO_IS_VALID(port))
return ~0; return ~0;
val = in_le32((u32 *)(port+pci_io_base)); val = in_le32((u32 *)(port+pci_io_base));
if (EEH_POSSIBLE_IO_ERROR(val, u32)) if (EEH_POSSIBLE_ERROR(val, u32))
return eeh_check_failure((void __iomem *)(port), val); return eeh_check_failure((void __iomem *)(port), val);
return val; return val;
} }
...@@ -324,19 +309,19 @@ static inline void eeh_outl(u32 val, unsigned long port) { ...@@ -324,19 +309,19 @@ static inline void eeh_outl(u32 val, unsigned long port) {
/* in-string eeh macros */ /* in-string eeh macros */
static inline void eeh_insb(unsigned long port, void * buf, int ns) { static inline void eeh_insb(unsigned long port, void * buf, int ns) {
_insb((u8 *)(port+pci_io_base), buf, ns); _insb((u8 *)(port+pci_io_base), buf, ns);
if (EEH_POSSIBLE_IO_ERROR((*(((u8*)buf)+ns-1)), u8)) if (EEH_POSSIBLE_ERROR((*(((u8*)buf)+ns-1)), u8))
eeh_check_failure((void __iomem *)(port), *(u8*)buf); eeh_check_failure((void __iomem *)(port), *(u8*)buf);
} }
static inline void eeh_insw_ns(unsigned long port, void * buf, int ns) { static inline void eeh_insw_ns(unsigned long port, void * buf, int ns) {
_insw_ns((u16 *)(port+pci_io_base), buf, ns); _insw_ns((u16 *)(port+pci_io_base), buf, ns);
if (EEH_POSSIBLE_IO_ERROR((*(((u16*)buf)+ns-1)), u16)) if (EEH_POSSIBLE_ERROR((*(((u16*)buf)+ns-1)), u16))
eeh_check_failure((void __iomem *)(port), *(u16*)buf); eeh_check_failure((void __iomem *)(port), *(u16*)buf);
} }
static inline void eeh_insl_ns(unsigned long port, void * buf, int nl) { static inline void eeh_insl_ns(unsigned long port, void * buf, int nl) {
_insl_ns((u32 *)(port+pci_io_base), buf, nl); _insl_ns((u32 *)(port+pci_io_base), buf, nl);
if (EEH_POSSIBLE_IO_ERROR((*(((u32*)buf)+nl-1)), u32)) if (EEH_POSSIBLE_ERROR((*(((u32*)buf)+nl-1)), u32))
eeh_check_failure((void __iomem *)(port), *(u32*)buf); eeh_check_failure((void __iomem *)(port), *(u32*)buf);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7