lkml.org 
[lkml]   [2007]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] pci: allow multiple calls to pcim_pin_device()
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>
---
It was an actual bug in pcim_pin_device() implementation. Thanks for
spotting this. :-)

Ian McDonald, please verify your warning goes away with this patch.

Greg, please forward this patch upstream once Ian acks it.

Thanks.

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8b44cff..a1927ea 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -751,7 +751,8 @@ int pci_enable_device(struct pci_dev *dev)
* when a device is enabled using managed PCI device enable interface.
*/
struct pci_devres {
- unsigned int disable:1;
+ unsigned int enabled:1;
+ unsigned int pinned:1;
unsigned int orig_intx:1;
unsigned int restore_intx:1;
u32 region_mask;
@@ -775,7 +776,7 @@ static void pcim_release(struct device *gendev, void *res)
if (this->restore_intx)
pci_intx(dev, this->orig_intx);

- if (this->disable)
+ if (this->enabled && !this->pinned)
pci_disable_device(dev);
}

@@ -814,12 +815,12 @@ int pcim_enable_device(struct pci_dev *pdev)
dr = get_pci_dr(pdev);
if (unlikely(!dr))
return -ENOMEM;
- WARN_ON(!!dr->disable);
+ WARN_ON(!!dr->enabled);

rc = pci_enable_device(pdev);
if (!rc) {
pdev->is_managed = 1;
- dr->disable = 1;
+ dr->enabled = 1;
}
return rc;
}
@@ -837,9 +838,9 @@ void pcim_pin_device(struct pci_dev *pdev)
struct pci_devres *dr;

dr = find_pci_dr(pdev);
- WARN_ON(!dr || !dr->disable);
+ WARN_ON(!dr || !dr->enabled);
if (dr)
- dr->disable = 0;
+ dr->pinned = 1;
}

/**
@@ -870,7 +871,7 @@ pci_disable_device(struct pci_dev *dev)

dr = find_pci_dr(dev);
if (dr)
- dr->disable = 0;
+ dr->enabled = 0;

if (atomic_sub_return(1, &dev->enable_cnt) != 0)
return;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2007-02-20 09:31    [W:0.043 / U:6.988 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site