From b4c1e0a0e70d656d966b4cd188e0ef61eeedbbad Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Mon, 14 Jan 2013 15:11:58 +0000 Subject: [PATCH] --- yaml --- r: 360047 b: refs/heads/master c: 8cd3d64c5714de7e17eccde48837b329f67bd85e h: refs/heads/master i: 360045: cbb6caba0b66fa33ac119c2b992dc32d98b0065d 360043: 1e456814d06297ec03ef6480c514868171055501 360039: 50102f39b8869a20ea138e3ecec888f6b5e50437 360031: b010cb1a152033d71a14fd966009a50cdc317c3f v: v3 --- [refs] | 2 +- trunk/arch/mips/pci/pci-xlp.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e45ba24f516..1ae72454a758 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e45e542cd742c1c3e30e7f252640644c66548b5 +refs/heads/master: 8cd3d64c5714de7e17eccde48837b329f67bd85e diff --git a/trunk/arch/mips/pci/pci-xlp.c b/trunk/arch/mips/pci/pci-xlp.c index 5077148bd67d..fbf001a068a4 100644 --- a/trunk/arch/mips/pci/pci-xlp.c +++ b/trunk/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; }