evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[POWERPC] Disable PCI IO/Mem on a device when resources can't be allocated"

Browse source 
This reverts commit 553aa7659b at Ben H's
request, because it confused IORESOURCE_* flags with command register
bits.

Requested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2007-12-31 10:04:15 +11:00
parent d2d8cfc657
commit 533b1928b5
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/powerpc/kernel/pci-common.c
View file

@ -1035,7 +1035,7 @@ clear_resource:
} }
} }
static inline int __devinit alloc_resource(struct pci_dev *dev, int idx) static inline void __devinit alloc_resource(struct pci_dev *dev, int idx)
{ {
struct resource *pr, *r = &dev->resource[idx]; struct resource *pr, *r = &dev->resource[idx];
@ -1059,10 +1059,7 @@ static inline int __devinit alloc_resource(struct pci_dev *dev, int idx)
r->flags |= IORESOURCE_UNSET; r->flags |= IORESOURCE_UNSET;
r->end -= r->start; r->end -= r->start;
r->start = 0; r->start = 0;
return -EBUSY;
} }
return 0;
} }
static void __init pcibios_allocate_resources(int pass) static void __init pcibios_allocate_resources(int pass)
@ -1084,12 +1081,8 @@ static void __init pcibios_allocate_resources(int pass)
disabled = !(command & PCI_COMMAND_IO); disabled = !(command & PCI_COMMAND_IO);
else else
disabled = !(command & PCI_COMMAND_MEMORY); disabled = !(command & PCI_COMMAND_MEMORY);
if (pass == disabled && alloc_resource(dev, idx)) { if (pass == disabled)
command &= ~(r->flags & (IORESOURCE_IO | alloc_resource(dev, idx);
IORESOURCE_MEM));
pci_write_config_word(dev,
PCI_COMMAND, command);
}
} }
if (pass) if (pass)
continue; continue;