iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] ppc64: PCI address cache minor fixes

Browse Source 
03-eeh-addr-cache-cleanup.patch

This is a minor patch to clean up a buglet related to the PCI address cache.
(The buglet doesn't manifes itself unless there are also bugs elsewhere,
which is why its minor.).  Also:

-- Improved debug printing.
-- Declare some private routines as static
-- Adds reference counting to struct pci_dn->pcidev structure

Signed-off-by: Linas Vepstas <linas@linas.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Linas Vepstas 2005-11-03 18:48:45 -06:00 committed by Paul Mackerras
parent 6937650214
commit 56b0fca3a0
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/ppc64/kernel/eeh.c
View File

@ -219,9 +219,9 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
while (*p) { while (*p) {
parent = *p; parent = *p;
piar = rb_entry(parent, struct pci_io_addr_range, rb_node); piar = rb_entry(parent, struct pci_io_addr_range, rb_node);
if (alo < piar->addr_lo) { if (ahi < piar->addr_lo) {
p = &parent->rb_left; p = &parent->rb_left;
} else if (ahi > piar->addr_hi) { } else if (alo > piar->addr_hi) {
p = &parent->rb_right; p = &parent->rb_right;
} else { } else {
if (dev != piar->pcidev || if (dev != piar->pcidev ||
@ -240,6 +240,11 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
piar->pcidev = dev; piar->pcidev = dev;
piar->flags = flags; piar->flags = flags;
#ifdef DEBUG
printk(KERN_DEBUG "PIAR: insert range=[%lx:%lx] dev=%s\n",
alo, ahi, pci_name (dev));
#endif
rb_link_node(&piar->rb_node, parent, p); rb_link_node(&piar->rb_node, parent, p);
rb_insert_color(&piar->rb_node, &pci_io_addr_cache_root.rb_root); rb_insert_color(&piar->rb_node, &pci_io_addr_cache_root.rb_root);
@ -301,7 +306,7 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev)
* we maintain a cache of devices that can be quickly searched. * we maintain a cache of devices that can be quickly searched.
* This routine adds a device to that cache. * This routine adds a device to that cache.
*/ */
void pci_addr_cache_insert_device(struct pci_dev *dev) static void pci_addr_cache_insert_device(struct pci_dev *dev)
{ {
unsigned long flags; unsigned long flags;
@ -344,7 +349,7 @@ restart:
* the tree multiple times (once per resource). * the tree multiple times (once per resource).
* But so what; device removal doesn't need to be that fast. * But so what; device removal doesn't need to be that fast.
*/ */
void pci_addr_cache_remove_device(struct pci_dev *dev) static void pci_addr_cache_remove_device(struct pci_dev *dev)
{ {
unsigned long flags; unsigned long flags;
@ -366,6 +371,9 @@ void __init pci_addr_cache_build(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
if (!eeh_subsystem_enabled)
return;
spin_lock_init(&pci_io_addr_cache_root.piar_lock); spin_lock_init(&pci_io_addr_cache_root.piar_lock);
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
@ -837,7 +845,7 @@ void eeh_add_device_early(struct device_node *dn)
info.buid_lo = BUID_LO(phb->buid); info.buid_lo = BUID_LO(phb->buid);
early_enable_eeh(dn, &info); early_enable_eeh(dn, &info);
} }
EXPORT_SYMBOL(eeh_add_device_early); EXPORT_SYMBOL_GPL(eeh_add_device_early);
/** /**
* eeh_add_device_late - perform EEH initialization for the indicated pci device * eeh_add_device_late - perform EEH initialization for the indicated pci device
@ -848,6 +856,8 @@ EXPORT_SYMBOL(eeh_add_device_early);
*/ */
void eeh_add_device_late(struct pci_dev *dev) void eeh_add_device_late(struct pci_dev *dev)
{ {
struct device_node *dn;
if (!dev || !eeh_subsystem_enabled) if (!dev || !eeh_subsystem_enabled)
return; return;
@ -855,9 +865,13 @@ void eeh_add_device_late(struct pci_dev *dev)
printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev)); printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev));
#endif #endif
pci_dev_get (dev);
dn = pci_device_to_OF_node(dev);
PCI_DN(dn)->pcidev = dev;
pci_addr_cache_insert_device (dev); pci_addr_cache_insert_device (dev);
} }
EXPORT_SYMBOL(eeh_add_device_late); EXPORT_SYMBOL_GPL(eeh_add_device_late);
/** /**
* eeh_remove_device - undo EEH setup for the indicated pci device * eeh_remove_device - undo EEH setup for the indicated pci device
@ -868,6 +882,7 @@ EXPORT_SYMBOL(eeh_add_device_late);
*/ */
void eeh_remove_device(struct pci_dev *dev) void eeh_remove_device(struct pci_dev *dev)
{ {
struct device_node *dn;
if (!dev || !eeh_subsystem_enabled) if (!dev || !eeh_subsystem_enabled)
return; return;
@ -876,8 +891,12 @@ void eeh_remove_device(struct pci_dev *dev)
printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev)); printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));
#endif #endif
pci_addr_cache_remove_device(dev); pci_addr_cache_remove_device(dev);
dn = pci_device_to_OF_node(dev);
PCI_DN(dn)->pcidev = NULL;
pci_dev_put (dev);
} }
EXPORT_SYMBOL(eeh_remove_device); EXPORT_SYMBOL_GPL(eeh_remove_device);
static int proc_eeh_show(struct seq_file *m, void *v) static int proc_eeh_show(struct seq_file *m, void *v)
{ {

4
include/asm-powerpc/ppc-pci.h
View File

@ -40,10 +40,6 @@ void pci_devs_phb_init(void);
void pci_devs_phb_init_dynamic(struct pci_controller *phb); void pci_devs_phb_init_dynamic(struct pci_controller *phb);
void __devinit scan_phb(struct pci_controller *hose); void __devinit scan_phb(struct pci_controller *hose);
/* PCI address cache management routines */
void pci_addr_cache_insert_device(struct pci_dev *dev);
void pci_addr_cache_remove_device(struct pci_dev *dev);
/* From rtas_pci.h */ /* From rtas_pci.h */
void init_pci_config_tokens (void); void init_pci_config_tokens (void);
unsigned long get_phb_buid (struct device_node *); unsigned long get_phb_buid (struct device_node *);