lkml.org 
[lkml]   [2019]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 2/5] PCI/ATS: Fix PRI PF/VF dependency issues
Date
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

As per PCIe spec r4.0, sec 9.3.7.11 ("Page Request Interface (PRI)"),
all VFs associated with PF can only use the Page Request Interface
of the PF and not implement it. So for any PRI capability related
queries on a VF device use associated PF device capabilities. Also
disable PRI on PF only when all related VFs disable PRI.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Suggested-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
drivers/pci/ats.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-
include/linux/pci.h | 1 +
2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index 5b78f3b1b918..3fcef4544c4c 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -154,10 +154,33 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs)
u16 control, status;
u32 max_requests;
int pos;
+ struct pci_dev *pf;

if (WARN_ON(pdev->pri_enabled))
return -EBUSY;

+ /* If PRI Capability is invalid, return error */
+ if (pdev->is_virtfn || pdev->is_physfn) {
+ if (pdev->invalid_cap & PCI_IOV_INVALID_PRI)
+ return -EINVAL;
+ }
+
+ if (pdev->is_virtfn) {
+ pf = pci_physfn(pdev);
+
+ /* If VF config does not match with PF, return error */
+ if (!pf->pri_enabled)
+ return -EINVAL;
+
+ pdev->pri_reqs_alloc = pf->pri_reqs_alloc;
+ pdev->pri_enabled = 1;
+
+ /* Increment PF PRI refcount */
+ atomic_inc(&pf->pri_ref_cnt);
+
+ return 0;
+ }
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return -EINVAL;
@@ -175,7 +198,6 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs)
pci_write_config_word(pdev, pos + PCI_PRI_CTRL, control);

pdev->pri_enabled = 1;
-
return 0;
}
EXPORT_SYMBOL_GPL(pci_enable_pri);
@@ -190,10 +212,27 @@ void pci_disable_pri(struct pci_dev *pdev)
{
u16 control;
int pos;
+ struct pci_dev *pf;

if (WARN_ON(!pdev->pri_enabled))
return;

+ /* All VFs should be disabled before disabling PF */
+ if (atomic_read(&pdev->pri_ref_cnt))
+ return;
+
+ if (pdev->is_virtfn) {
+ /* Since VF shares PRI with PF, use PF config. */
+ pf = pci_physfn(pdev);
+
+ /* Decrement PF PRI refcount */
+ atomic_dec(&pf->pri_ref_cnt);
+
+ pdev->pri_enabled = 0;
+
+ return;
+ }
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return;
@@ -219,6 +258,9 @@ void pci_restore_pri_state(struct pci_dev *pdev)
if (!pdev->pri_enabled)
return;

+ if (pdev->is_virtfn)
+ return;
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return;
@@ -243,6 +285,9 @@ int pci_reset_pri(struct pci_dev *pdev)
if (WARN_ON(pdev->pri_enabled))
return -EBUSY;

+ if (pdev->is_virtfn)
+ return 0;
+
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return -EINVAL;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 489fc0f68bb1..d5df80ab2645 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -448,6 +448,7 @@ struct pci_dev {
#endif
#ifdef CONFIG_PCI_PRI
u32 pri_reqs_alloc; /* Number of PRI requests allocated */
+ atomic_t pri_ref_cnt; /* Number of VFs with PRI enabled */
#endif
#ifdef CONFIG_PCI_PASID
u16 pasid_features;
--
2.20.1
\
 
 \ /
  Last update: 2019-03-06 23:13    [W:0.029 / U:3.040 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site