From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: David Marchand <david.marchand@redhat.com>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: "thomas@monjalon.net" <thomas@monjalon.net>,
"ferruh.yigit@amd.com" <ferruh.yigit@amd.com>,
"nipun.gupta@amd.com" <nipun.gupta@amd.com>,
"Richardson, Bruce" <bruce.richardson@intel.com>,
"Sevincer, Abdullah" <abdullah.sevincer@intel.com>,
Gaetan Rivet <grive@u256.net>
Subject: RE: [PATCH v3 12/15] pci: define some ACS constants
Date: Tue, 19 Sep 2023 02:35:12 +0000 [thread overview]
Message-ID: <CH3PR11MB83623462418269673EA574DF9CFAA@CH3PR11MB8362.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230914123615.1705654-13-david.marchand@redhat.com>
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Thursday, September 14, 2023 8:36 PM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; ferruh.yigit@amd.com; Xia, Chenbo
> <chenbo.xia@intel.com>; nipun.gupta@amd.com; Richardson, Bruce
> <bruce.richardson@intel.com>; Sevincer, Abdullah
> <abdullah.sevincer@intel.com>; Gaetan Rivet <grive@u256.net>
> Subject: [PATCH v3 12/15] pci: define some ACS constants
>
> Define some PCI ACS extended feature constants and use them in existing
> drivers.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> drivers/event/dlb2/pf/dlb2_main.c | 23 ++++++++---------------
> lib/pci/rte_pci.h | 9 +++++++++
> 2 files changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/event/dlb2/pf/dlb2_main.c
> b/drivers/event/dlb2/pf/dlb2_main.c
> index 29e3001627..8e729d1964 100644
> --- a/drivers/event/dlb2/pf/dlb2_main.c
> +++ b/drivers/event/dlb2/pf/dlb2_main.c
> @@ -33,13 +33,6 @@
> #define DLB2_PCI_ERR_ROOT_STATUS 0x30
> #define DLB2_PCI_ERR_COR_STATUS 0x10
> #define DLB2_PCI_ERR_UNCOR_STATUS 0x4
> -#define DLB2_PCI_ACS_CAP 0x4
> -#define DLB2_PCI_ACS_CTRL 0x6
> -#define DLB2_PCI_ACS_SV 0x1
> -#define DLB2_PCI_ACS_RR 0x4
> -#define DLB2_PCI_ACS_CR 0x8
> -#define DLB2_PCI_ACS_UF 0x10
> -#define DLB2_PCI_ACS_EC 0x20
>
> static int
> dlb2_pf_init_driver_state(struct dlb2_dev *dlb2_dev)
> @@ -492,16 +485,16 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
>
> if (acs_cap_offset >= 0) {
> uint16_t acs_cap, acs_ctrl, acs_mask;
> - off = acs_cap_offset + DLB2_PCI_ACS_CAP;
> + off = acs_cap_offset + RTE_PCI_ACS_CAP;
> if (rte_pci_read_config(pdev, &acs_cap, 2, off) != 2)
> acs_cap = 0;
>
> - off = acs_cap_offset + DLB2_PCI_ACS_CTRL;
> + off = acs_cap_offset + RTE_PCI_ACS_CTRL;
> if (rte_pci_read_config(pdev, &acs_ctrl, 2, off) != 2)
> acs_ctrl = 0;
>
> - acs_mask = DLB2_PCI_ACS_SV | DLB2_PCI_ACS_RR;
> - acs_mask |= (DLB2_PCI_ACS_CR | DLB2_PCI_ACS_UF);
> + acs_mask = RTE_PCI_ACS_SV | RTE_PCI_ACS_RR;
> + acs_mask |= (RTE_PCI_ACS_CR | RTE_PCI_ACS_UF);
> acs_ctrl |= (acs_cap & acs_mask);
>
> ret = rte_pci_write_config(pdev, &acs_ctrl, 2, off);
> @@ -511,15 +504,15 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
> return ret;
> }
>
> - off = acs_cap_offset + DLB2_PCI_ACS_CTRL;
> + off = acs_cap_offset + RTE_PCI_ACS_CTRL;
> if (rte_pci_read_config(pdev, &acs_ctrl, 2, off) != 2)
> acs_ctrl = 0;
>
> - acs_mask = DLB2_PCI_ACS_RR | DLB2_PCI_ACS_CR;
> - acs_mask |= DLB2_PCI_ACS_EC;
> + acs_mask = RTE_PCI_ACS_RR | RTE_PCI_ACS_CR;
> + acs_mask |= RTE_PCI_ACS_EC;
> acs_ctrl &= ~acs_mask;
>
> - off = acs_cap_offset + DLB2_PCI_ACS_CTRL;
> + off = acs_cap_offset + RTE_PCI_ACS_CTRL;
> ret = rte_pci_write_config(pdev, &acs_ctrl, 2, off);
> if (ret != 2) {
> DLB2_LOG_ERR("[%s()] failed to write the pcie config
> space at offset %d\n",
> diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
> index 1fdca91f8b..a6c52a232d 100644
> --- a/lib/pci/rte_pci.h
> +++ b/lib/pci/rte_pci.h
> @@ -102,6 +102,15 @@ extern "C" {
> #define RTE_PCI_EXT_CAP_ID_SRIOV 0x10 /* SR-IOV */
> #define RTE_PCI_EXT_CAP_ID_PRI 0x13 /* Page Request Interface
> */
>
> +/* Access Control Service (RTE_PCI_EXT_CAP_ID_ACS) */
> +#define RTE_PCI_ACS_CAP 0x04 /* ACS Capability Register
> */
> +#define RTE_PCI_ACS_CTRL 0x06 /* ACS Control Register */
> +#define RTE_PCI_ACS_SV 0x0001 /* Source Validation */
> +#define RTE_PCI_ACS_RR 0x0004 /* P2P Request Redirect */
> +#define RTE_PCI_ACS_CR 0x0008 /* P2P Completion Redirect
> */
> +#define RTE_PCI_ACS_UF 0x0010 /* Upstream Forwarding */
> +#define RTE_PCI_ACS_EC 0x0020 /* P2P Egress Control */
> +
> /* Single Root I/O Virtualization (RTE_PCI_EXT_CAP_ID_SRIOV) */
> #define RTE_PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */
> #define RTE_PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */
> --
> 2.41.0
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2023-09-19 2:35 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 7:50 [PATCH 00/14] Cleanup PCI(e) drivers David Marchand
2023-08-03 7:50 ` [PATCH 01/14] drivers: remove duplicated PCI master control David Marchand
2023-08-03 9:45 ` Bruce Richardson
2023-10-07 2:53 ` fengchengwen
2023-08-03 7:50 ` [PATCH 02/14] bus/pci: add const to some experimental API David Marchand
2023-08-03 9:46 ` Bruce Richardson
2023-08-03 11:50 ` David Marchand
2023-08-03 7:50 ` [PATCH 03/14] bus/pci: find PCI capability David Marchand
2023-08-03 9:49 ` Bruce Richardson
2023-08-03 9:52 ` Bruce Richardson
2023-08-03 11:49 ` David Marchand
2023-08-03 7:50 ` [PATCH 04/14] pci: define some capability constants David Marchand
2023-08-03 9:51 ` Bruce Richardson
2023-08-03 7:50 ` [PATCH 05/14] pci: define some MSIX constants David Marchand
2023-08-03 9:53 ` Bruce Richardson
2023-08-03 7:50 ` [PATCH 06/14] pci: define some command constants David Marchand
2023-08-03 9:57 ` Bruce Richardson
2023-08-03 11:51 ` David Marchand
2023-08-08 9:20 ` David Marchand
2023-08-08 10:08 ` Bruce Richardson
2023-08-22 19:23 ` Adam Hassick
2023-08-03 7:50 ` [PATCH 07/14] pci: define some BAR constants David Marchand
2023-08-03 9:58 ` Bruce Richardson
2023-08-03 7:50 ` [PATCH 08/14] pci: define some PM constants David Marchand
2023-08-03 9:59 ` Bruce Richardson
2023-08-03 7:50 ` [PATCH 09/14] pci: define some PCIe constants David Marchand
2023-08-03 10:01 ` Bruce Richardson
2023-08-03 7:50 ` [PATCH 10/14] pci: define some extended capability constants David Marchand
2023-08-03 7:50 ` [PATCH 11/14] pci: define some ACS constants David Marchand
2023-08-03 7:50 ` [PATCH 12/14] pci: define some PRI constants David Marchand
2023-08-03 7:50 ` [PATCH 13/14] pci: define some AER constants David Marchand
2023-08-03 7:50 ` [PATCH 14/14] devtools: forbid inclusion of Linux header for PCI David Marchand
2023-08-03 10:03 ` [PATCH 00/14] Cleanup PCI(e) drivers Bruce Richardson
2023-08-21 11:35 ` [PATCH v2 00/15] " David Marchand
2023-08-21 11:35 ` [PATCH v2 01/15] drivers: remove duplicated PCI master control David Marchand
2023-09-06 13:02 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 02/15] bus/pci: add const to some experimental API David Marchand
2023-08-21 16:14 ` Tyler Retzlaff
2023-09-06 13:02 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 03/15] bus/pci: rework MSIX discovery with VFIO David Marchand
2023-09-06 13:03 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 04/15] bus/pci: find PCI capability David Marchand
2023-09-07 12:43 ` Xia, Chenbo
2023-09-14 12:29 ` David Marchand
2023-09-19 2:19 ` Xia, Chenbo
2023-09-19 9:00 ` David Marchand
2023-08-21 11:35 ` [PATCH v2 05/15] pci: define some capability constants David Marchand
2023-09-07 13:15 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 06/15] pci: define some MSIX constants David Marchand
2023-09-07 13:15 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 07/15] pci: define some command constants David Marchand
2023-09-07 13:15 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 08/15] pci: define some BAR constants David Marchand
2023-09-07 13:16 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 09/15] pci: define some PM constants David Marchand
2023-09-07 13:16 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 10/15] pci: define some PCIe constants David Marchand
2023-09-07 13:16 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 11/15] pci: define some extended capability constants David Marchand
2023-09-07 13:23 ` Xia, Chenbo
2023-08-21 11:35 ` [PATCH v2 12/15] pci: define some ACS constants David Marchand
2023-08-21 11:35 ` [PATCH v2 13/15] pci: define some PRI constants David Marchand
2023-08-21 11:35 ` [PATCH v2 14/15] pci: define some AER constants David Marchand
2023-08-21 11:35 ` [PATCH v2 15/15] devtools: forbid inclusion of Linux header for PCI David Marchand
2023-08-21 16:24 ` Tyler Retzlaff
2023-09-07 13:33 ` Xia, Chenbo
2023-08-22 15:30 ` [PATCH v2 00/15] Cleanup PCI(e) drivers Patrick Robb
2023-08-22 16:09 ` [PATCH 00/14] " Adam Hassick
2023-08-22 16:48 ` Adam Hassick
2023-08-24 15:44 ` Adam Hassick
2023-09-14 12:35 ` [PATCH v3 00/15] " David Marchand
2023-09-14 12:36 ` [PATCH v3 01/15] drivers: remove duplicated PCI master control David Marchand
2023-09-14 12:36 ` [PATCH v3 02/15] bus/pci: add const to some experimental API David Marchand
2023-09-14 12:36 ` [PATCH v3 03/15] bus/pci: rework MSIX discovery with VFIO David Marchand
2023-09-14 12:36 ` [PATCH v3 04/15] bus/pci: find PCI capability David Marchand
2023-09-19 2:33 ` Xia, Chenbo
2023-09-14 12:36 ` [PATCH v3 05/15] pci: define some capability constants David Marchand
2023-09-15 16:27 ` Sevincer, Abdullah
2023-09-14 12:36 ` [PATCH v3 06/15] pci: define some MSIX constants David Marchand
2023-09-14 12:36 ` [PATCH v3 07/15] pci: define some command constants David Marchand
2023-09-14 12:36 ` [PATCH v3 08/15] pci: define some BAR constants David Marchand
2023-09-14 12:36 ` [PATCH v3 09/15] pci: define some PM constants David Marchand
2023-09-14 12:36 ` [PATCH v3 10/15] pci: define some PCIe constants David Marchand
2023-09-15 16:26 ` Sevincer, Abdullah
2023-09-14 12:36 ` [PATCH v3 11/15] pci: define some extended capability constants David Marchand
2023-09-15 16:27 ` Sevincer, Abdullah
2023-09-14 12:36 ` [PATCH v3 12/15] pci: define some ACS constants David Marchand
2023-09-15 16:25 ` Sevincer, Abdullah
2023-09-19 2:35 ` Xia, Chenbo [this message]
2023-09-14 12:36 ` [PATCH v3 13/15] pci: define some PRI constants David Marchand
2023-09-15 16:21 ` Sevincer, Abdullah
2023-09-19 2:36 ` Xia, Chenbo
2023-09-14 12:36 ` [PATCH v3 14/15] pci: define some AER constants David Marchand
2023-09-15 16:26 ` Sevincer, Abdullah
2023-09-19 2:36 ` Xia, Chenbo
2023-09-14 12:36 ` [PATCH v3 15/15] devtools: forbid inclusion of Linux header for PCI David Marchand
2023-09-15 15:14 ` [PATCH v3 00/15] Cleanup PCI(e) drivers Stephen Hemminger
2023-09-19 12:41 ` David Marchand
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=CH3PR11MB83623462418269673EA574DF9CFAA@CH3PR11MB8362.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=abdullah.sevincer@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=grive@u256.net \
--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).