From: Adam Hassick <ahassick@iol.unh.edu>
To: David Marchand <david.marchand@redhat.com>
Cc: dev@dpdk.org
Subject: Re: [PATCH 06/14] pci: define some command constants
Date: Tue, 22 Aug 2023 15:23:54 -0400 [thread overview]
Message-ID: <CAC-YWqih_gEK6rMwJtWb3BMYKttAM0jFHL3kMV2aeZ9bq8C89A@mail.gmail.com> (raw)
In-Reply-To: <20230803075038.307012-7-david.marchand@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 4336 bytes --]
Recheck-request: iol-sample-apps-testing,
This email is a test of the community lab's retesting system, please
ignore. Testing superseded reply on a patch.
On Thu, Aug 3, 2023 at 3:51 AM David Marchand <david.marchand@redhat.com>
wrote:
> Define some PCI command constants and use them in existing drivers.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/bus/pci/linux/pci_vfio.c | 8 ++++----
> drivers/event/dlb2/pf/dlb2_main.c | 8 +++-----
> lib/pci/rte_pci.h | 4 +++-
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/bus/pci/linux/pci_vfio.c
> b/drivers/bus/pci/linux/pci_vfio.c
> index 6d13cafdcf..f96b3ce7fb 100644
> --- a/drivers/bus/pci/linux/pci_vfio.c
> +++ b/drivers/bus/pci/linux/pci_vfio.c
> @@ -156,18 +156,18 @@ pci_vfio_enable_bus_memory(struct rte_pci_device
> *dev, int dev_fd)
> return -1;
> }
>
> - ret = pread64(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
> + ret = pread64(dev_fd, &cmd, sizeof(cmd), offset + RTE_PCI_COMMAND);
>
> if (ret != sizeof(cmd)) {
> RTE_LOG(ERR, EAL, "Cannot read command from PCI config
> space!\n");
> return -1;
> }
>
> - if (cmd & PCI_COMMAND_MEMORY)
> + if (cmd & RTE_PCI_COMMAND_MEMORY)
> return 0;
>
> - cmd |= PCI_COMMAND_MEMORY;
> - ret = pwrite64(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
> + cmd |= RTE_PCI_COMMAND_MEMORY;
> + ret = pwrite64(dev_fd, &cmd, sizeof(cmd), offset +
> RTE_PCI_COMMAND);
>
> if (ret != sizeof(cmd)) {
> RTE_LOG(ERR, EAL, "Cannot write command to PCI config
> space!\n");
> diff --git a/drivers/event/dlb2/pf/dlb2_main.c
> b/drivers/event/dlb2/pf/dlb2_main.c
> index c6606a9bee..6dbaa2ff97 100644
> --- a/drivers/event/dlb2/pf/dlb2_main.c
> +++ b/drivers/event/dlb2/pf/dlb2_main.c
> @@ -33,7 +33,6 @@
> #define DLB2_PCI_EXP_DEVCTL2 40
> #define DLB2_PCI_LNKCTL2 48
> #define DLB2_PCI_SLTCTL2 56
> -#define DLB2_PCI_CMD 4
> #define DLB2_PCI_EXP_DEVSTA 10
> #define DLB2_PCI_EXP_DEVSTA_TRPND 0x20
> #define DLB2_PCI_EXP_DEVCTL_BCR_FLR 0x8000
> @@ -47,7 +46,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_COMMAND_INTX_DISABLE 0x400
> #define DLB2_PCI_ACS_CAP 0x4
> #define DLB2_PCI_ACS_CTRL 0x6
> #define DLB2_PCI_ACS_SV 0x1
> @@ -286,7 +284,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
>
> /* clear the PCI command register before issuing the FLR */
>
> - off = DLB2_PCI_CMD;
> + off = RTE_PCI_COMMAND;
> cmd = 0;
> if (rte_pci_write_config(pdev, &cmd, 2, off) != 2) {
> DLB2_LOG_ERR("[%s()] failed to write the pci command\n",
> @@ -468,9 +466,9 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
> }
> }
>
> - off = DLB2_PCI_CMD;
> + off = RTE_PCI_COMMAND;
> if (rte_pci_read_config(pdev, &cmd, 2, off) == 2) {
> - cmd &= ~DLB2_PCI_COMMAND_INTX_DISABLE;
> + cmd &= ~RTE_PCI_COMMAND_INTX_DISABLE;
> if (rte_pci_write_config(pdev, &cmd, 2, off) != 2) {
> DLB2_LOG_ERR("[%s()] failed to write the pci
> command\n",
> __func__);
> diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
> index a055a28592..bf2b2639f4 100644
> --- a/lib/pci/rte_pci.h
> +++ b/lib/pci/rte_pci.h
> @@ -32,10 +32,12 @@ extern "C" {
>
> #define RTE_PCI_VENDOR_ID 0x00 /* 16 bits */
> #define RTE_PCI_DEVICE_ID 0x02 /* 16 bits */
> -#define RTE_PCI_COMMAND 0x04 /* 16 bits */
>
> /* PCI Command Register */
> +#define RTE_PCI_COMMAND 0x04 /* 16 bits */
> +#define RTE_PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space
> */
> #define RTE_PCI_COMMAND_MASTER 0x4 /* Bus Master Enable */
> +#define RTE_PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
>
> /* PCI Status Register */
> #define RTE_PCI_STATUS 0x06 /* 16 bits */
> --
> 2.41.0
>
>
[-- Attachment #2: Type: text/html, Size: 5359 bytes --]
next prev parent reply other threads:[~2023-08-22 19:23 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 [this message]
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
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=CAC-YWqih_gEK6rMwJtWb3BMYKttAM0jFHL3kMV2aeZ9bq8C89A@mail.gmail.com \
--to=ahassick@iol.unh.edu \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
/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).