From: Abdullah Sevincer <abdullah.sevincer@intel.com>
To: dev@dpdk.org
Cc: jerinj@marvell.com, mike.ximing.chen@intel.com,
bruce.richardson@intel.com, thomas@monjalon.net,
david.marchand@redhat.com, nipun.gupta@amd.com,
chenbox@nvidia.com,
Abdullah Sevincer <abdullah.sevincer@intel.com>
Subject: [PATCH v2] bus/pci: revise support PASID control
Date: Tue, 14 Nov 2023 11:36:09 -0600 [thread overview]
Message-ID: <20231114173609.3590237-1-abdullah.sevincer@intel.com> (raw)
In-Reply-To: <20231113172759.3529518-1-abdullah.sevincer@intel.com>
This commit revises PASID control function to accept PASID offset to
pasid *structure* instead of taking exact register for controlling the
feature.
PASID control function was introduced in earlier commit.
Please see commit 5a6878335b81 ("event/dlb2: disable PASID") and
commit 60ea19609aec ("bus/pci: add PASID control").
Signed-off-by: Abdullah Sevincer <abdullah.sevincer@intel.com>
---
drivers/bus/pci/pci_common.c | 5 ++---
drivers/bus/pci/rte_bus_pci.h | 5 ++++-
drivers/event/dlb2/pf/dlb2_main.c | 4 ++--
lib/pci/rte_pci.h | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index ba5e280d33..889a48d2af 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -943,9 +943,8 @@ rte_pci_pasid_set_state(const struct rte_pci_device *dev,
off_t offset, bool enable)
{
uint16_t pasid = enable;
- return rte_pci_write_config(dev, &pasid, sizeof(pasid), offset) < 0
- ? -1
- : 0;
+ return rte_pci_write_config(dev, &pasid, sizeof(pasid),
+ offset + RTE_PCI_PASID_CTRL) != sizeof(pasid) ? -1 : 0;
}
struct rte_pci_bus rte_pci_bus = {
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index f07bf9b588..35d07d8294 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -161,9 +161,12 @@ int rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable);
* @param dev
* A pointer to a rte_pci_device structure.
* @param offset
- * Offset of the PASID external capability.
+ * Offset of the PASID external capability structure.
* @param enable
* Flag to enable or disable PASID.
+ *
+ * @return
+ * 0 on success, -1 on error in PCI config space read/write.
*/
__rte_internal
int rte_pci_pasid_set_state(const struct rte_pci_device *dev,
diff --git a/drivers/event/dlb2/pf/dlb2_main.c b/drivers/event/dlb2/pf/dlb2_main.c
index 61a7b39eef..a95d3227a4 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -518,8 +518,8 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
/* Disable PASID if it is enabled by default, which
* breaks the DLB if enabled.
*/
- off = DLB2_PCI_PASID_CAP_OFFSET + RTE_PCI_PASID_CTRL;
- if (rte_pci_pasid_set_state(pdev, off, false)) {
+ off = DLB2_PCI_PASID_CAP_OFFSET;
+ if (rte_pci_pasid_set_state(pdev, off, false) < 0) {
DLB2_LOG_ERR("[%s()] failed to write the pcie config space at offset %d\n",
__func__, (int)off);
return -1;
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 0d2d8d8fed..c26fc77209 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -101,7 +101,7 @@ extern "C" {
#define RTE_PCI_EXT_CAP_ID_ACS 0x0d /* Access Control Services */
#define RTE_PCI_EXT_CAP_ID_SRIOV 0x10 /* SR-IOV */
#define RTE_PCI_EXT_CAP_ID_PRI 0x13 /* Page Request Interface */
-#define RTE_PCI_EXT_CAP_ID_PASID 0x1B /* Process Address Space ID */
+#define RTE_PCI_EXT_CAP_ID_PASID 0x1b /* Process Address Space ID */
/* Advanced Error Reporting (RTE_PCI_EXT_CAP_ID_ERR) */
#define RTE_PCI_ERR_UNCOR_STATUS 0x04 /* Uncorrectable Error Status */
--
2.25.1
next prev parent reply other threads:[~2023-11-14 17:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 17:05 [PATCH v7 0/2] *** Disable PASID for DLB Device *** Abdullah Sevincer
2023-11-06 17:05 ` [PATCH v7 1/2] bus/pci: support PASID control Abdullah Sevincer
2023-11-06 18:30 ` David Marchand
2023-11-06 18:50 ` Sevincer, Abdullah
2023-11-10 8:03 ` David Marchand
2023-11-13 15:51 ` Sevincer, Abdullah
2023-11-13 17:36 ` Sevincer, Abdullah
2023-11-13 17:27 ` [PATCH v1] bus/pci: revise " Abdullah Sevincer
2023-11-14 13:59 ` Chenbo Xia
2023-11-14 17:39 ` Sevincer, Abdullah
2023-11-15 1:53 ` Chenbo Xia
2023-11-16 17:43 ` Chen, Mike Ximing
2023-11-17 6:48 ` Chenbo Xia
2023-11-14 17:36 ` Abdullah Sevincer [this message]
2023-11-17 6:55 ` [PATCH v2] " Chenbo Xia
2023-11-21 15:50 ` Thomas Monjalon
2023-11-06 17:05 ` [PATCH v7 2/2] event/dlb2: fix disable PASID Abdullah Sevincer
2023-11-06 17:50 ` [PATCH v7 0/2] *** Disable PASID for DLB Device *** Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114173609.3590237-1-abdullah.sevincer@intel.com \
--to=abdullah.sevincer@intel.com \
--cc=bruce.richardson@intel.com \
--cc=chenbox@nvidia.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=mike.ximing.chen@intel.com \
--cc=nipun.gupta@amd.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).