summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
authorJayachandran C <jchandra@broadcom.com>2013-01-14 15:11:58 +0000
committerJohn Crispin <blogic@openwrt.org>2013-02-17 00:15:20 +0100
commit8cd3d64c5714de7e17eccde48837b329f67bd85e (patch)
tree98a584e60cd4ec7fbaaebf04c85f2dc04b12e3bd /arch/mips/pci
parent4e45e542cd742c1c3e30e7f252640644c66548b5 (diff)
downloadop-kernel-dev-8cd3d64c5714de7e17eccde48837b329f67bd85e.zip
op-kernel-dev-8cd3d64c5714de7e17eccde48837b329f67bd85e.tar.gz
MIPS: PCI: Prevent hang on XLP reg read
Reading PCI extended register at 0x255 on a bridge will hang if there is no device connected on the link. Make PCI read routine skip this register. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Patchwork: http://patchwork.linux-mips.org/patch/4789/ Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r--arch/mips/pci/pci-xlp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-xlp.c b/arch/mips/pci/pci-xlp.c
index 5077148..fbf001a 100644
--- a/arch/mips/pci/pci-xlp.c
+++ b/arch/mips/pci/pci-xlp.c
@@ -64,8 +64,12 @@ static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn,
u32 data;
u32 *cfgaddr;
+ where &= ~3;
+ if (bus->number == 0 && PCI_SLOT(devfn) == 1 && where == 0x954)
+ return 0xffffffff;
+
cfgaddr = (u32 *)(pci_config_base +
- pci_cfg_addr(bus->number, devfn, where & ~3));
+ pci_cfg_addr(bus->number, devfn, where));
data = *cfgaddr;
return data;
}
OpenPOWER on IntegriCloud