diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /arch/ppc64 | |
parent | f44702f49056c203341badaa2cb8a706160d9119 (diff) | |
parent | a04ce0ffcaf561994ecf382cd3caad75556dc499 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/kernel/eeh.c | 31 | ||||
-rw-r--r-- | arch/ppc64/kernel/iSeries_VpdInfo.c | 5 | ||||
-rw-r--r-- | arch/ppc64/kernel/pci.c | 1 |
3 files changed, 15 insertions, 22 deletions
diff --git a/arch/ppc64/kernel/eeh.c b/arch/ppc64/kernel/eeh.c index af5272fedadf..4c857a6516fc 100644 --- a/arch/ppc64/kernel/eeh.c +++ b/arch/ppc64/kernel/eeh.c | |||
@@ -202,10 +202,9 @@ static void pci_addr_cache_print(struct pci_io_addr_cache *cache) | |||
202 | while (n) { | 202 | while (n) { |
203 | struct pci_io_addr_range *piar; | 203 | struct pci_io_addr_range *piar; |
204 | piar = rb_entry(n, struct pci_io_addr_range, rb_node); | 204 | piar = rb_entry(n, struct pci_io_addr_range, rb_node); |
205 | printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s %s\n", | 205 | printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n", |
206 | (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt, | 206 | (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt, |
207 | piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev), | 207 | piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev)); |
208 | pci_pretty_name(piar->pcidev)); | ||
209 | cnt++; | 208 | cnt++; |
210 | n = rb_next(n); | 209 | n = rb_next(n); |
211 | } | 210 | } |
@@ -260,8 +259,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev) | |||
260 | 259 | ||
261 | dn = pci_device_to_OF_node(dev); | 260 | dn = pci_device_to_OF_node(dev); |
262 | if (!dn) { | 261 | if (!dn) { |
263 | printk(KERN_WARNING "PCI: no pci dn found for dev=%s %s\n", | 262 | printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n", |
264 | pci_name(dev), pci_pretty_name(dev)); | 263 | pci_name(dev)); |
265 | return; | 264 | return; |
266 | } | 265 | } |
267 | 266 | ||
@@ -269,8 +268,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev) | |||
269 | if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) || | 268 | if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) || |
270 | dn->eeh_mode & EEH_MODE_NOCHECK) { | 269 | dn->eeh_mode & EEH_MODE_NOCHECK) { |
271 | #ifdef DEBUG | 270 | #ifdef DEBUG |
272 | printk(KERN_INFO "PCI: skip building address cache for=%s %s\n", | 271 | printk(KERN_INFO "PCI: skip building address cache for=%s\n", |
273 | pci_name(dev), pci_pretty_name(dev)); | 272 | pci_name(dev)); |
274 | #endif | 273 | #endif |
275 | return; | 274 | return; |
276 | } | 275 | } |
@@ -447,12 +446,12 @@ static void eeh_panic(struct pci_dev *dev, int reset_state) | |||
447 | * in light of potential corruption, we can use it here. | 446 | * in light of potential corruption, we can use it here. |
448 | */ | 447 | */ |
449 | if (panic_on_oops) | 448 | if (panic_on_oops) |
450 | panic("EEH: MMIO failure (%d) on device:%s %s\n", reset_state, | 449 | panic("EEH: MMIO failure (%d) on device:%s\n", reset_state, |
451 | pci_name(dev), pci_pretty_name(dev)); | 450 | pci_name(dev)); |
452 | else { | 451 | else { |
453 | __get_cpu_var(ignored_failures)++; | 452 | __get_cpu_var(ignored_failures)++; |
454 | printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s %s\n", | 453 | printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s\n", |
455 | reset_state, pci_name(dev), pci_pretty_name(dev)); | 454 | reset_state, pci_name(dev)); |
456 | } | 455 | } |
457 | } | 456 | } |
458 | 457 | ||
@@ -482,8 +481,8 @@ static void eeh_event_handler(void *dummy) | |||
482 | break; | 481 | break; |
483 | 482 | ||
484 | printk(KERN_INFO "EEH: MMIO failure (%d), notifiying device " | 483 | printk(KERN_INFO "EEH: MMIO failure (%d), notifiying device " |
485 | "%s %s\n", event->reset_state, | 484 | "%s\n", event->reset_state, |
486 | pci_name(event->dev), pci_pretty_name(event->dev)); | 485 | pci_name(event->dev)); |
487 | 486 | ||
488 | atomic_set(&eeh_fail_count, 0); | 487 | atomic_set(&eeh_fail_count, 0); |
489 | notifier_call_chain (&eeh_notifier_chain, | 488 | notifier_call_chain (&eeh_notifier_chain, |
@@ -851,8 +850,7 @@ void eeh_add_device_late(struct pci_dev *dev) | |||
851 | return; | 850 | return; |
852 | 851 | ||
853 | #ifdef DEBUG | 852 | #ifdef DEBUG |
854 | printk(KERN_DEBUG "EEH: adding device %s %s\n", pci_name(dev), | 853 | printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev)); |
855 | pci_pretty_name(dev)); | ||
856 | #endif | 854 | #endif |
857 | 855 | ||
858 | pci_addr_cache_insert_device (dev); | 856 | pci_addr_cache_insert_device (dev); |
@@ -873,8 +871,7 @@ void eeh_remove_device(struct pci_dev *dev) | |||
873 | 871 | ||
874 | /* Unregister the device with the EEH/PCI address search system */ | 872 | /* Unregister the device with the EEH/PCI address search system */ |
875 | #ifdef DEBUG | 873 | #ifdef DEBUG |
876 | printk(KERN_DEBUG "EEH: remove device %s %s\n", pci_name(dev), | 874 | printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev)); |
877 | pci_pretty_name(dev)); | ||
878 | #endif | 875 | #endif |
879 | pci_addr_cache_remove_device(dev); | 876 | pci_addr_cache_remove_device(dev); |
880 | } | 877 | } |
diff --git a/arch/ppc64/kernel/iSeries_VpdInfo.c b/arch/ppc64/kernel/iSeries_VpdInfo.c index d11c732daf81..5d921792571f 100644 --- a/arch/ppc64/kernel/iSeries_VpdInfo.c +++ b/arch/ppc64/kernel/iSeries_VpdInfo.c | |||
@@ -264,8 +264,5 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count) | |||
264 | printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s ", | 264 | printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s ", |
265 | count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor, | 265 | count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor, |
266 | frame, card); | 266 | frame, card); |
267 | if (pci_class_name(PciDev->class >> 8) == 0) | 267 | printk("0x%04X\n", (int)(PciDev->class >> 8)); |
268 | printk("0x%04X\n", (int)(PciDev->class >> 8)); | ||
269 | else | ||
270 | printk("%s\n", pci_class_name(PciDev->class >> 8)); | ||
271 | } | 268 | } |
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index d0d55c7908ef..b5ca7d8347e2 100644 --- a/arch/ppc64/kernel/pci.c +++ b/arch/ppc64/kernel/pci.c | |||
@@ -84,7 +84,6 @@ static void fixup_broken_pcnet32(struct pci_dev* dev) | |||
84 | if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) { | 84 | if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) { |
85 | dev->vendor = PCI_VENDOR_ID_AMD; | 85 | dev->vendor = PCI_VENDOR_ID_AMD; |
86 | pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD); | 86 | pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD); |
87 | pci_name_device(dev); | ||
88 | } | 87 | } |
89 | } | 88 | } |
90 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); | 89 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); |