From 14ded0b73891d1c4b91954b6e5850176776712d2 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 20 Dec 2007 14:55:05 +1100 Subject: [PATCH] --- yaml --- r: 81127 b: refs/heads/master c: 553aa7659bc0e188348f64e978343ed984eb6e56 h: refs/heads/master i: 81125: 8d00c371a10d920c81a60eec934bbf2b104f9a63 81123: 713a672deba687b45ed19e3f777f431702f2e55b 81119: ac6bb28522c80b419bf0e45251072208737f82e9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c4d42961dd63..62d53ba4bb68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be8cbcd8896670a01ead7a29e33ffe29604ed734 +refs/heads/master: 553aa7659bc0e188348f64e978343ed984eb6e56 diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c index 1037b3a093ee..88838b0f8b90 100644 --- a/trunk/arch/powerpc/kernel/pci-common.c +++ b/trunk/arch/powerpc/kernel/pci-common.c @@ -1034,7 +1034,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) } } -static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) +static inline int __devinit alloc_resource(struct pci_dev *dev, int idx) { struct resource *pr, *r = &dev->resource[idx]; @@ -1058,7 +1058,10 @@ static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) r->flags |= IORESOURCE_UNSET; r->end -= r->start; r->start = 0; + + return -EBUSY; } + return 0; } static void __init pcibios_allocate_resources(int pass) @@ -1080,8 +1083,12 @@ static void __init pcibios_allocate_resources(int pass) disabled = !(command & PCI_COMMAND_IO); else disabled = !(command & PCI_COMMAND_MEMORY); - if (pass == disabled) - alloc_resource(dev, idx); + if (pass == disabled && alloc_resource(dev, idx)) { + command &= ~(r->flags & (IORESOURCE_IO | + IORESOURCE_MEM)); + pci_write_config_word(dev, + PCI_COMMAND, command); + } } if (pass) continue;