@@ -345,6 +345,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)
{
u16 control, supported;
int pos;
+ struct pci_dev *pf;
if (WARN_ON(pdev->pasid_enabled))
return -EBUSY;
@@ -353,7 +354,33 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)
return -EINVAL;
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);
- if (!pos)
+
+ if (pdev->is_virtfn) {
+ /*
+ * Per PCIe r4.0, sec 9.3.7.14, VF must not implement
+ * Process Address Space ID (PASID) Capability.
+ */
+ if (pos) {
+ dev_err(&pdev->dev, "VF must not implement PASID\n");
+ return -EINVAL;
+ }
+ /* Since VF shares PASID with PF, use PF config */
+ pf = pci_physfn(pdev);
+
+ /* If VF config does not match with PF, return error */
+ if (!pf->pasid_enabled || pf->pasid_features != features)
+ return -EINVAL;
+
+ pdev->pasid_features = features;
+ pdev->pasid_enabled = 1;
+
+ /* Increment PF PASID refcount */
+ atomic_inc(&pf->pasid_ref_cnt);
+
+ return 0;
+ }
+
+ if (pdev->is_physfn && !pos)
return -EINVAL;
pci_read_config_word(pdev, pos + PCI_PASID_CAP, &supported);
@@ -382,10 +409,27 @@ void pci_disable_pasid(struct pci_dev *pdev)
{
u16 control = 0;
int pos;
+ struct pci_dev *pf;
if (WARN_ON(!pdev->pasid_enabled))
return;
+ /* All VFs PASID should be disabled before disabling PF PASID*/
+ if (atomic_read(&pdev->pasid_ref_cnt))
+ return;
+
+ if (pdev->is_virtfn) {
+ /* Since VF shares PASID with PF, use PF config. */
+ pf = pci_physfn(pdev);
+
+ /* Decrement PF PASID refcount */
+ atomic_dec(&pf->pasid_ref_cnt);
+
+ pdev->pasid_enabled = 0;
+
+ return;
+ }
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);
if (!pos)
return;
@@ -408,6 +452,9 @@ void pci_restore_pasid_state(struct pci_dev *pdev)
if (!pdev->pasid_enabled)
return;
+ if (pdev->is_virtfn)
+ return;
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);
if (!pos)
return;
@@ -432,6 +479,9 @@ int pci_pasid_features(struct pci_dev *pdev)
u16 supported;
int pos;
+ if (pdev->is_virtfn)
+ pdev = pci_physfn(pdev);
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);
if (!pos)
return -EINVAL;
@@ -488,6 +538,9 @@ int pci_max_pasids(struct pci_dev *pdev)
u16 supported;
int pos;
+ if (pdev->is_virtfn)
+ pdev = pci_physfn(pdev);
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);
if (!pos)
return -EINVAL;
@@ -454,6 +454,7 @@ struct pci_dev {
#endif
#ifdef CONFIG_PCI_PASID
u16 pasid_features;
+ atomic_t pasid_ref_cnt; /* Number of VFs with PASID enabled */
#endif
#ifdef CONFIG_PCI_P2PDMA
struct pci_p2pdma *p2pdma;