aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2009-12-07 00:03:21 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-12-16 16:37:50 -0500
commitb9c3b266411d27f1a6466c19d146d08db576bfea (patch)
treec310b37e7dff6607e22eca0b690c2a3f290c85a9 /drivers/pci/pci.c
parent2820f333e3b4ad96590093efbed7b3400bcf492b (diff)
PCI: support device-specific reset methods
Add a new type of quirk for resetting devices at pci_dev_reset time. This is necessary to handle device with nonstandard reset procedures, especially useful for guest drivers. Signed-off-by: Yu Zhao <yu.zhao@intel.com> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0bc27e059019..6011d064e89d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2284,6 +2284,21 @@ static int pci_parent_bus_reset(struct pci_dev *dev, int probe)
2284 return 0; 2284 return 0;
2285} 2285}
2286 2286
2287static int pci_dev_specific_reset(struct pci_dev *dev, int probe)
2288{
2289 struct pci_dev_reset_methods *i;
2290
2291 for (i = pci_dev_reset_methods; i->reset; i++) {
2292 if ((i->vendor == dev->vendor ||
2293 i->vendor == (u16)PCI_ANY_ID) &&
2294 (i->device == dev->device ||
2295 i->device == (u16)PCI_ANY_ID))
2296 return i->reset(dev, probe);
2297 }
2298
2299 return -ENOTTY;
2300}
2301
2287static int pci_dev_reset(struct pci_dev *dev, int probe) 2302static int pci_dev_reset(struct pci_dev *dev, int probe)
2288{ 2303{
2289 int rc; 2304 int rc;
@@ -2296,6 +2311,10 @@ static int pci_dev_reset(struct pci_dev *dev, int probe)
2296 down(&dev->dev.sem); 2311 down(&dev->dev.sem);
2297 } 2312 }
2298 2313
2314 rc = pci_dev_specific_reset(dev, probe);
2315 if (rc != -ENOTTY)
2316 goto done;
2317
2299 rc = pcie_flr(dev, probe); 2318 rc = pcie_flr(dev, probe);
2300 if (rc != -ENOTTY) 2319 if (rc != -ENOTTY)
2301 goto done; 2320 goto done;