renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code

PCI: Clean up ATS error handling

Browse Source 
There's no need to BUG() if we enable ATS when it's already enabled.  We
don't need to BUG() when disabling ATS on a device that doesn't support ATS
or if it's already disabled.  If ATS is enabled, certainly we found an ATS
capability in the past, so it should still be there now.

Clean up these error paths.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Bjorn Helgaas 2015-07-17 15:43:27 -05:00
parent c39127dbaf
commit a021f3019d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pci/ats.c
View File

@ -44,11 +44,12 @@ int pci_enable_ats(struct pci_dev *dev, int ps)
u16 ctrl;
struct pci_dev *pdev;
BUG_ON(dev->ats_cap && dev->ats_enabled);
if (!dev->ats_cap)
return -EINVAL;
if (WARN_ON(pci_ats_enabled(dev)))
return -EBUSY;
if (ps < PCI_ATS_MIN_STU)
return -EINVAL;
@ -83,7 +84,8 @@ void pci_disable_ats(struct pci_dev *dev)
struct pci_dev *pdev;
u16 ctrl;
BUG_ON(!dev->ats_cap || !dev->ats_enabled);
if (WARN_ON(!pci_ats_enabled(dev)))
return;
if (atomic_read(&dev->ats_ref_cnt))
return; /* VFs still enabled */
@ -107,8 +109,6 @@ void pci_restore_ats_state(struct pci_dev *dev)
if (!pci_ats_enabled(dev))
return;
if (!pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ATS))
BUG();
ctrl = PCI_ATS_CTRL_ENABLE;
if (!dev->is_virtfn)