diff options
author | Shaohua Li <shaohua.li@intel.com> | 2007-10-23 22:45:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 18:04:19 -0500 |
commit | 4348a2dc49f9baecd34a9b0904245488c6189398 (patch) | |
tree | cbe391c0f28ac367767c7427991cd9689c042458 /drivers/pci/pci.c | |
parent | 39ec4561b3a9ccccbdab1dd88a045342be22f27b (diff) |
pcie: utilize pcie transaction pending bit
PCIE has a mechanism to wait for Non-Posted request to complete. I think
pci_disable_device is a good place to do this.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 089184bc327d..d30e802d9a1a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -314,6 +314,24 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap) | |||
314 | } | 314 | } |
315 | EXPORT_SYMBOL_GPL(pci_find_ht_capability); | 315 | EXPORT_SYMBOL_GPL(pci_find_ht_capability); |
316 | 316 | ||
317 | void pcie_wait_pending_transaction(struct pci_dev *dev) | ||
318 | { | ||
319 | int pos; | ||
320 | u16 reg16; | ||
321 | |||
322 | pos = pci_find_capability(dev, PCI_CAP_ID_EXP); | ||
323 | if (!pos) | ||
324 | return; | ||
325 | while (1) { | ||
326 | pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, ®16); | ||
327 | if (!(reg16 & PCI_EXP_DEVSTA_TRPND)) | ||
328 | break; | ||
329 | cpu_relax(); | ||
330 | } | ||
331 | |||
332 | } | ||
333 | EXPORT_SYMBOL_GPL(pcie_wait_pending_transaction); | ||
334 | |||
317 | /** | 335 | /** |
318 | * pci_find_parent_resource - return resource region of parent bus of given region | 336 | * pci_find_parent_resource - return resource region of parent bus of given region |
319 | * @dev: PCI device structure contains resources to be searched | 337 | * @dev: PCI device structure contains resources to be searched |
@@ -884,6 +902,9 @@ pci_disable_device(struct pci_dev *dev) | |||
884 | if (atomic_sub_return(1, &dev->enable_cnt) != 0) | 902 | if (atomic_sub_return(1, &dev->enable_cnt) != 0) |
885 | return; | 903 | return; |
886 | 904 | ||
905 | /* Wait for all transactions are finished before disabling the device */ | ||
906 | pcie_wait_pending_transaction(dev); | ||
907 | |||
887 | pci_read_config_word(dev, PCI_COMMAND, &pci_command); | 908 | pci_read_config_word(dev, PCI_COMMAND, &pci_command); |
888 | if (pci_command & PCI_COMMAND_MASTER) { | 909 | if (pci_command & PCI_COMMAND_MASTER) { |
889 | pci_command &= ~PCI_COMMAND_MASTER; | 910 | pci_command &= ~PCI_COMMAND_MASTER; |