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

PCI: allow multiple calls to pcim_pin_device()

Browse Source 
Sanity check in pcim_pin_device() was too restrictive in that it didn't
allow multiple calls to the function, which is against the devres
philosohpy of fire-and-forget.  Track pinned status separately and allow
pinning multiple times.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tejun Heo
2007-02-25 04:36:01 -08:00
committed by Greg Kroah-Hartman
parent a967e127d0
commit 7f375f325f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pci/pci.c
View File

@@ -757,7 +757,8 @@ int pci_enable_device(struct pci_dev *dev)
* when a device is enabled using managed PCI device enable interface. * when a device is enabled using managed PCI device enable interface.
*/ */
struct pci_devres { struct pci_devres {
unsigned int disable:1; unsigned int enabled:1;
unsigned int pinned:1;
unsigned int orig_intx:1; unsigned int orig_intx:1;
unsigned int restore_intx:1; unsigned int restore_intx:1;
u32 region_mask; u32 region_mask;
@@ -781,7 +782,7 @@ static void pcim_release(struct device *gendev, void *res)
if (this->restore_intx) if (this->restore_intx)
pci_intx(dev, this->orig_intx); pci_intx(dev, this->orig_intx);
if (this->disable) if (this->enabled && !this->pinned)
pci_disable_device(dev); pci_disable_device(dev);
} }
@@ -820,12 +821,12 @@ int pcim_enable_device(struct pci_dev *pdev)
dr = get_pci_dr(pdev); dr = get_pci_dr(pdev);
if (unlikely(!dr)) if (unlikely(!dr))
return -ENOMEM; return -ENOMEM;
WARN_ON(!!dr->disable); WARN_ON(!!dr->enabled);
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (!rc) { if (!rc) {
pdev->is_managed = 1; pdev->is_managed = 1;
dr->disable = 1; dr->enabled = 1;
} }
return rc; return rc;
} }
@@ -843,9 +844,9 @@ void pcim_pin_device(struct pci_dev *pdev)
struct pci_devres *dr; struct pci_devres *dr;
dr = find_pci_dr(pdev); dr = find_pci_dr(pdev);
WARN_ON(!dr || !dr->disable); WARN_ON(!dr || !dr->enabled);
if (dr) if (dr)
dr->disable = 0; dr->pinned = 1;
} }
/** /**
@@ -876,7 +877,7 @@ pci_disable_device(struct pci_dev *dev)
dr = find_pci_dr(dev); dr = find_pci_dr(dev);
if (dr) if (dr)
dr->disable = 0; dr->enabled = 0;
if (atomic_sub_return(1, &dev->enable_cnt) != 0) if (atomic_sub_return(1, &dev->enable_cnt) != 0)
return; return;