diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2008-04-24 08:51:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:35:46 -0400 |
commit | 72cff12397cd6648b8b5abfaeb00502f45b76cb8 (patch) | |
tree | ce02610079e017eabe0945259025a43bdca90d11 /arch/alpha/kernel/sys_nautilus.c | |
parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) |
alpha: fix legacy mode PCI IDE controllers
Legacy IDE resources were never properly allocated on most
alpha platforms, so IDE expectedly stopped working after
commit 10f000a2fd805e8ccfe988e8615545467bb7f7df (generic
pci_enable_resources).
Always allocate "fixed" PCI resources before doing anything else;
remove Cypress IDE quirk, as it's a generic problem which is
handled in common PCI probe code.
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/kernel/sys_nautilus.c')
-rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 920196bcbb61..a7f23b5ab814 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c | |||
@@ -187,6 +187,7 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr) | |||
187 | } | 187 | } |
188 | 188 | ||
189 | extern void free_reserved_mem(void *, void *); | 189 | extern void free_reserved_mem(void *, void *); |
190 | extern void pcibios_claim_one_bus(struct pci_bus *); | ||
190 | 191 | ||
191 | static struct resource irongate_mem = { | 192 | static struct resource irongate_mem = { |
192 | .name = "Irongate PCI MEM", | 193 | .name = "Irongate PCI MEM", |
@@ -205,6 +206,7 @@ nautilus_init_pci(void) | |||
205 | /* Scan our single hose. */ | 206 | /* Scan our single hose. */ |
206 | bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); | 207 | bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); |
207 | hose->bus = bus; | 208 | hose->bus = bus; |
209 | pcibios_claim_one_bus(bus); | ||
208 | 210 | ||
209 | irongate = pci_get_bus_and_slot(0, 0); | 211 | irongate = pci_get_bus_and_slot(0, 0); |
210 | bus->self = irongate; | 212 | bus->self = irongate; |