aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2011-11-11 10:06:56 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-12-05 10:22:03 -0800
commit60fe823837d10673500ff685c01eb2f896fe5849 (patch)
treec39f6ae4d9944e766628b1dcd301cda5e4597532 /drivers/pci
parenta776c491ca5e38c26d9f66923ff574d041e747f4 (diff)
PCI: Enable is not exposed as a PASID capability
The PASID ECN indicates bit 0 is reserved in the capability register. Switch pci_enable_pasid() to error if PASID is already enabled and don't expose enable as a feature in pci_pasid_features(). Reviewed-by: Joerg Roedel <joerg.roedel@amd.com> Tested-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/ats.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index 831e1920386..8e95a123d37 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -348,7 +348,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)
pci_read_config_word(pdev, pos + PCI_PASID_CONTROL_OFF, &control);
pci_read_config_word(pdev, pos + PCI_PASID_CAP_OFF, &supported);
- if (!(supported & PCI_PASID_ENABLE))
+ if (control & PCI_PASID_ENABLE)
return -EINVAL;
supported &= PCI_PASID_EXEC | PCI_PASID_PRIV;
@@ -390,7 +390,6 @@ EXPORT_SYMBOL_GPL(pci_disable_pasid);
* Returns a negative value when no PASI capability is present.
* Otherwise is returns a bitmask with supported features. Current
* features reported are:
- * PCI_PASID_ENABLE - PASID capability can be enabled
* PCI_PASID_EXEC - Execute permission supported
* PCI_PASID_PRIV - Priviledged mode supported
*/
@@ -405,7 +404,7 @@ int pci_pasid_features(struct pci_dev *pdev)
pci_read_config_word(pdev, pos + PCI_PASID_CAP_OFF, &supported);
- supported &= PCI_PASID_ENABLE | PCI_PASID_EXEC | PCI_PASID_PRIV;
+ supported &= PCI_PASID_EXEC | PCI_PASID_PRIV;
return supported;
}