From patchwork Fri Nov 3 17:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sevincer, Abdullah" X-Patchwork-Id: 133849 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2934F4327C; Fri, 3 Nov 2023 18:53:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15CE740A76; Fri, 3 Nov 2023 18:53:17 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mails.dpdk.org (Postfix) with ESMTP id 12278402F2 for ; Fri, 3 Nov 2023 18:53:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699033996; x=1730569996; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+KeGDRqQWo8pdPOkSebQplXsgnn2eTZkLl1/eRiDqRM=; b=iRsmLgTdHNeZSIej0YNDARFqKOkY4378OgcCJPm3OUQjQtthiKpl8oUu CYXBGjGbHaK4C+0vlUffsLJkP7kCluA6WEOKk8gSR7PGPIWhyfZtl2cyA plI6c6Vih78uNuhdJcCoX+EcoEE6co2qektJEkdvSL4aj3FL6mT79FuzU vVIvzxx1/yEras1WIsXU3+otYAfJo7YC8myBFn/ojaC+wtJjkhaAYjmL5 9DwxgllRovD8pbvFvfq5fQo1bgsz9I8fGX6uGkc12fVFxdua2aXpDFYqh EXlQj79F1fycR0VbKJnuWhVxF1LPxhgv8CVkltnnIlSzcZ+2qj+5CIQ6n g==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1874436" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="1874436" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 10:53:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="827560648" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="827560648" Received: from txanpdk02.an.intel.com ([10.123.117.76]) by fmsmga008.fm.intel.com with ESMTP; 03 Nov 2023 10:53:13 -0700 From: Abdullah Sevincer To: dev@dpdk.org Cc: jerinj@marvell.com, mike.ximing.chen@intel.com, bruce.richardson@intel.com, thomas@monjalon.net, Abdullah Sevincer Subject: [PATCH v5 1/2] bus/pci: add function to enable/disable PASID Date: Fri, 3 Nov 2023 12:52:03 -0500 Message-Id: <20231103175204.2812654-2-abdullah.sevincer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231103175204.2812654-1-abdullah.sevincer@intel.com> References: <20231103175204.2812654-1-abdullah.sevincer@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This commit implements an internal api to enable and disable PASID for a device e.g. device driver event/dlb2. For kernels when PASID enabled by default it breaks DLB functionality, hence disabling PASID is required for DLB to function properly. PASID capability is not exposed to users hence offset can not be retrieved by rte_pci_find_ext_capability() api. Therefore, api implemented in this commit accepts an offset for PASID with an enable flag which is used to enable/disable PASID. Signed-off-by: Abdullah Sevincer --- drivers/bus/pci/pci_common.c | 7 +++++++ drivers/bus/pci/rte_bus_pci.h | 13 +++++++++++++ drivers/bus/pci/version.map | 1 + lib/pci/rte_pci.h | 5 +++++ 4 files changed, 26 insertions(+) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 921d957bf6..ced072825e 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -938,6 +938,13 @@ rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable) return 0; } +int +rte_pci_set_pasid(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; +} + struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_pci_scan, diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index 21e234abf0..2542300d2f 100644 --- a/drivers/bus/pci/rte_bus_pci.h +++ b/drivers/bus/pci/rte_bus_pci.h @@ -295,6 +295,19 @@ void rte_pci_ioport_read(struct rte_pci_ioport *p, void rte_pci_ioport_write(struct rte_pci_ioport *p, const void *data, size_t len, off_t offset); +/** + * Enable/Disable PASID. + * + * @param dev + * A pointer to a rte_pci_device structure. + * @param offset + * Offset of the PASID external capability. + * @param enable + * Flag to enable or disable PASID. + */ +__rte_internal +int rte_pci_set_pasid(const struct rte_pci_device *dev, off_t offset, bool enable); + #ifdef __cplusplus } #endif diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map index 74c5b075d5..347b9010e9 100644 --- a/drivers/bus/pci/version.map +++ b/drivers/bus/pci/version.map @@ -37,5 +37,6 @@ INTERNAL { rte_pci_get_sysfs_path; rte_pci_register; + rte_pci_set_pasid; rte_pci_unregister; }; diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h index 69e932d910..772a8d5622 100644 --- a/lib/pci/rte_pci.h +++ b/lib/pci/rte_pci.h @@ -101,6 +101,11 @@ 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 */ + +/* Process Address Space ID */ +#define RTE_PCI_PASID_CTRL 0x06 /* PASID control register */ +#define RTE_PCI_PASID_CAP_OFFSET 0x148 /* PASID capability offset */ /* Advanced Error Reporting (RTE_PCI_EXT_CAP_ID_ERR) */ #define RTE_PCI_ERR_UNCOR_STATUS 0x04 /* Uncorrectable Error Status */ From patchwork Fri Nov 3 17:52:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sevincer, Abdullah" X-Patchwork-Id: 133850 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E7174327C; Fri, 3 Nov 2023 18:53:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A12402F2; Fri, 3 Nov 2023 18:53:20 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mails.dpdk.org (Postfix) with ESMTP id 30F2340EA5; Fri, 3 Nov 2023 18:53:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699033999; x=1730569999; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dXNAKnwN1DvRTGvymjA9Q++1t2gkSmD1qgT3FaqB3jM=; b=aZ5l+6Tr00s9vKXJ0tq90ND/H9S2pfZoTF7Bm0Z7G2NXloyg1e2wSMbK gfpxJ6/wXr3I4IGzlHf2Th3clKPvb6xY832U7RVUNpImrf20DjITAf7K1 QsN9IoM081WbsDz3sCWWU7SBNtjAzJsvnMRseSLPjfVHheiVIO6T93qwi M+xYc7TVevEHtHQX6aylVBqQS0l40UMNbGPUnBQL4c+UNfXaB07z4fAol uWllJ3AahYBLxhxDPW5AfFE8MN8dlQnV5FogpXfTIc0RveELpCCa/vJUy boeyeUElB4aWzQX7zFg/twXtXvipEI/9wFRlwPDYGXmlv1Df+EqNmGatw Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1874444" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="1874444" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 10:53:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="827560681" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="827560681" Received: from txanpdk02.an.intel.com ([10.123.117.76]) by fmsmga008.fm.intel.com with ESMTP; 03 Nov 2023 10:53:18 -0700 From: Abdullah Sevincer To: dev@dpdk.org Cc: jerinj@marvell.com, mike.ximing.chen@intel.com, bruce.richardson@intel.com, thomas@monjalon.net, Abdullah Sevincer , stable@dpdk.org Subject: [PATCH v5 2/2] event/dlb2: fix disable PASID Date: Fri, 3 Nov 2023 12:52:04 -0500 Message-Id: <20231103175204.2812654-3-abdullah.sevincer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231103175204.2812654-1-abdullah.sevincer@intel.com> References: <20231103175204.2812654-1-abdullah.sevincer@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In vfio-pci driver when PASID is enabled by default DLB hardware puts DLB in SIOV mode. This breaks DLB PF-PMD mode. For DLB PF-PMD mode to function properly PASID needs to be disabled. In this commit this issue is addressed and PASID is disabled by writing a zero to PASID control register. Fixes: 5433956d5185 ("event/dlb2: add eventdev probe") Cc: stable@dpdk.org Signed-off-by: Abdullah Sevincer --- drivers/event/dlb2/pf/dlb2_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/event/dlb2/pf/dlb2_main.c b/drivers/event/dlb2/pf/dlb2_main.c index aa03e4c311..843fe215aa 100644 --- a/drivers/event/dlb2/pf/dlb2_main.c +++ b/drivers/event/dlb2/pf/dlb2_main.c @@ -514,6 +514,16 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev) } } + /* Disable PASID if it is enabled by default, which + * breaks the DLB if enabled. + */ + off = RTE_PCI_PASID_CAP_OFFSET + RTE_PCI_PASID_CTRL; + if (rte_pci_set_pasid(pdev, off, false)) { + DLB2_LOG_ERR("[%s()] failed to write the pcie config space at offset %d\n", + __func__, (int)off); + return -1; + } + return 0; }