lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Calgary IOMMU: fix reference counting of Calgary PCI devices

Browse Source 
The pci_get_device() API decrements the reference count on the 'from'
parameter when it continues searching. Therefore, take a ref count on
Calgary bus when we initialize them in either translated or
non-translated mode.

Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Muli Ben-Yehuda
2006-09-26 10:52:31 +02:00
committed by Andi Kleen
parent b8f4fe66a5
commit 871b17008e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86_64/kernel/pci-calgary.c
View File

@@ -786,6 +786,7 @@ static inline unsigned int __init locate_register_space(struct pci_dev *dev)
static int __init calgary_init_one_nontraslated(struct pci_dev *dev) static int __init calgary_init_one_nontraslated(struct pci_dev *dev)
{ {
pci_dev_get(dev);
dev->sysdata = NULL; dev->sysdata = NULL;
dev->bus->self = dev; dev->bus->self = dev;
@@ -810,6 +811,7 @@ static int __init calgary_init_one(struct pci_dev *dev)
if (ret) if (ret)
goto iounmap; goto iounmap;
pci_dev_get(dev);
dev->bus->self = dev; dev->bus->self = dev;
calgary_enable_translation(dev); calgary_enable_translation(dev);
@@ -836,10 +838,9 @@ static int __init calgary_init(void)
calgary_init_one_nontraslated(dev); calgary_init_one_nontraslated(dev);
continue; continue;
} }
if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots) { if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots)
pci_dev_put(dev);
continue; continue;
}
ret = calgary_init_one(dev); ret = calgary_init_one(dev);
if (ret) if (ret)
goto error; goto error;
@@ -860,9 +861,10 @@ error:
} }
if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots) if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots)
continue; continue;
calgary_disable_translation(dev); calgary_disable_translation(dev);
calgary_free_bus(dev); calgary_free_bus(dev);
pci_dev_put(dev); pci_dev_put(dev); /* Undo calgary_init_one()'s pci_dev_get() */
} }
return ret; return ret;