[PATCH 00/14] Cleanup PCI(e) drivers

[David Marchand]

Rather than rely on Linux headers to find some PCI(e) standard constants
or reinvent the same PCI capability helper, this series complements the
pci library and the pci bus driver.
PCI drivers can then use OS agnostic macros and helpers.

WARNING: this is only compile tested.

-- 
David Marchand

David Marchand (14):
  drivers: remove duplicated PCI master control
  bus/pci: add const to some experimental API
  bus/pci: find PCI capability
  pci: define some capability constants
  pci: define some MSIX constants
  pci: define some command constants
  pci: define some BAR constants
  pci: define some PM constants
  pci: define some PCIe constants
  pci: define some extended capability constants
  pci: define some ACS constants
  pci: define some PRI constants
  pci: define some AER constants
  devtools: forbid inclusion of Linux header for PCI

 devtools/checkpatches.sh|   8 ++
 drivers/bus/pci/linux/pci_init.h|  18 
 drivers/bus/pci/linux/pci_uio.c |  32 +-
 drivers/bus/pci/linux/pci_vfio.c| 142 ++---
 drivers/bus/pci/pci_common.c|  49 -
 drivers/bus/pci/rte_bus_pci.h   |  35 ++-
 drivers/bus/pci/version.map |   2 +
 drivers/crypto/virtio/virtio_pci.c  |  67 
 drivers/event/dlb2/pf/dlb2_main.c   | 156 
 drivers/net/bnx2x/bnx2x.c   |  86 ---
 drivers/net/bnx2x/bnx2x.h   |  46 
 drivers/net/cxgbe/base/adapter.h|  31 +-
 drivers/net/gve/gve_ethdev.c|  46 +---
 drivers/net/gve/gve_ethdev.h|  14 +--
 drivers/net/hns3/hns3_ethdev_vf.c   | 109 +++
 drivers/net/ngbe/base/ngbe_hw.c |  20 +---
 drivers/net/ngbe/base/ngbe_osdep.h  |   3 -
 drivers/net/virtio/virtio_pci.c | 131 ---
 drivers/vdpa/ifc/base/ifcvf_osdep.h |   4 +-
 lib/pci/rte_pci.h   |  77 +-
 20 files changed, 346 insertions(+), 730 deletions(-)

-- 
2.41.0

[PATCH 01/14] drivers: remove duplicated PCI master control

[David Marchand]

Use existing API to cleanup duplicated code.

Signed-off-by: David Marchand 
---
 drivers/bus/pci/linux/pci_uio.c| 32 +--
 drivers/bus/pci/linux/pci_vfio.c   | 41 ++
 drivers/net/hns3/hns3_ethdev_vf.c  | 25 +-
 drivers/net/ngbe/base/ngbe_hw.c| 20 ++-
 drivers/net/ngbe/base/ngbe_osdep.h |  3 ---
 5 files changed, 6 insertions(+), 115 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
index 2bf16e9369..97d740dfe5 100644
--- a/drivers/bus/pci/linux/pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #if defined(RTE_ARCH_X86)
 #include 
@@ -77,35 +76,6 @@ pci_uio_mmio_write(const struct rte_pci_device *dev, int bar,
return len;
 }
 
-static int
-pci_uio_set_bus_master(int dev_fd)
-{
-   uint16_t reg;
-   int ret;
-
-   ret = pread(dev_fd, ®, sizeof(reg), PCI_COMMAND);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot read command from PCI config space!\n");
-   return -1;
-   }
-
-   /* return if bus mastering is already on */
-   if (reg & PCI_COMMAND_MASTER)
-   return 0;
-
-   reg |= PCI_COMMAND_MASTER;
-
-   ret = pwrite(dev_fd, ®, sizeof(reg), PCI_COMMAND);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot write command to PCI config space!\n");
-   return -1;
-   }
-
-   return 0;
-}
-
 static int
 pci_mknod_uio_dev(const char *sysfs_uio_path, unsigned uio_num)
 {
@@ -299,7 +269,7 @@ pci_uio_alloc_resource(struct rte_pci_device *dev,
goto error;
 
/* set bus master that is not done by uio_pci_generic */
-   if (pci_uio_set_bus_master(uio_cfg_fd)) {
+   if (rte_pci_set_bus_master(dev, true)) {
RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n");
goto error;
}
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index e634de8322..8fa7fa458f 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -223,42 +223,6 @@ pci_vfio_enable_bus_memory(struct rte_pci_device *dev, int 
dev_fd)
return 0;
 }
 
-/* set PCI bus mastering */
-static int
-pci_vfio_set_bus_master(const struct rte_pci_device *dev, int dev_fd, bool op)
-{
-   uint64_t size, offset;
-   uint16_t reg;
-   int ret;
-
-   if (pci_vfio_get_region(dev, VFIO_PCI_CONFIG_REGION_INDEX,
-   &size, &offset) != 0) {
-   RTE_LOG(ERR, EAL, "Cannot get offset of CONFIG region.\n");
-   return -1;
-   }
-
-   ret = pread64(dev_fd, ®, sizeof(reg), offset + PCI_COMMAND);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL, "Cannot read command from PCI config 
space!\n");
-   return -1;
-   }
-
-   if (op)
-   /* set the master bit */
-   reg |= PCI_COMMAND_MASTER;
-   else
-   reg &= ~(PCI_COMMAND_MASTER);
-
-   ret = pwrite64(dev_fd, ®, sizeof(reg), offset + PCI_COMMAND);
-
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL, "Cannot write command to PCI config 
space!\n");
-   return -1;
-   }
-
-   return 0;
-}
-
 /* set up interrupt support (but not enable interrupts) */
 static int
 pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)
@@ -535,8 +499,7 @@ pci_rte_vfio_setup_device(struct rte_pci_device *dev, int 
vfio_dev_fd)
return -1;
}
 
-   /* set bus mastering for the device */
-   if (pci_vfio_set_bus_master(dev, vfio_dev_fd, true)) {
+   if (rte_pci_set_bus_master(dev, true)) {
RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n");
return -1;
}
@@ -1226,7 +1189,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device 
*dev)
if (vfio_dev_fd < 0)
return -1;
 
-   if (pci_vfio_set_bus_master(dev, vfio_dev_fd, false)) {
+   if (rte_pci_set_bus_master(dev, false)) {
RTE_LOG(ERR, EAL, "%s cannot unset bus mastering for PCI 
device!\n",
pci_addr);
return -1;
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 5aac62a41f..7b3c5dc168 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -49,29 +49,6 @@ static int hns3vf_remove_mc_mac_addr(struct hns3_hw *hw,
 static int hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,
   __rte_unused int wait_to_complete);
 
-/* set PCI bus mastering */
-static int
-hns3vf_set_bus_master(const struct rte_pci_device *device, bool op)
-{
-   uint16_t reg;
-   int ret;
-
-   ret = rte_pci_read_confi

[PATCH 02/14] bus/pci: add const to some experimental API

[David Marchand]

Those functions are fine with a const on the device pointer.

Signed-off-by: David Marchand 
---
 drivers/bus/pci/pci_common.c  | 4 ++--
 drivers/bus/pci/rte_bus_pci.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 52404ab0fe..382b0b8946 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -814,7 +814,7 @@ rte_pci_get_iommu_class(void)
 }
 
 off_t
-rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap)
+rte_pci_find_ext_capability(const struct rte_pci_device *dev, uint32_t cap)
 {
off_t offset = RTE_PCI_CFG_SPACE_SIZE;
uint32_t header;
@@ -857,7 +857,7 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
uint32_t cap)
 }
 
 int
-rte_pci_set_bus_master(struct rte_pci_device *dev, bool enable)
+rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable)
 {
uint16_t old_cmd, cmd;
 
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 9d59c4aef3..75d0030eae 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -85,7 +85,7 @@ void rte_pci_dump(FILE *f);
  *  = 0: Device does not support it.
  */
 __rte_experimental
-off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap);
+off_t rte_pci_find_ext_capability(const struct rte_pci_device *dev, uint32_t 
cap);
 
 /**
  * Enables/Disables Bus Master for device's PCI command register.
@@ -99,7 +99,7 @@ off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, 
uint32_t cap);
  *  0 on success, -1 on error in PCI config space read/write.
  */
 __rte_experimental
-int rte_pci_set_bus_master(struct rte_pci_device *dev, bool enable);
+int rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable);
 
 /**
  * Read PCI config space.
-- 
2.41.0

[PATCH 03/14] bus/pci: find PCI capability

[David Marchand]

Introduce two helpers so that drivers stop reinventing the wheel.
Use it in existing drivers.

Note:
- base/ drivers code is left untouched, only some wrappers in cxgbe
  are touched,
- bnx2x maintained a per device cache of capabilities, this code has been
  reworked to only cache the capabilities used in this driver,

Signed-off-by: David Marchand 
---
 drivers/bus/pci/linux/pci_vfio.c   |  86 +---
 drivers/bus/pci/pci_common.c   |  45 +++
 drivers/bus/pci/rte_bus_pci.h  |  31 
 drivers/bus/pci/version.map|   2 +
 drivers/crypto/virtio/virtio_pci.c |  57 +-
 drivers/event/dlb2/pf/dlb2_main.c  |  42 +-
 drivers/net/bnx2x/bnx2x.c  |  41 +-
 drivers/net/cxgbe/base/adapter.h   |  28 +--
 drivers/net/gve/gve_ethdev.c   |  46 ++-
 drivers/net/gve/gve_ethdev.h   |   4 -
 drivers/net/hns3/hns3_ethdev_vf.c  |  79 +++
 drivers/net/virtio/virtio_pci.c| 121 +
 lib/pci/rte_pci.h  |  10 +++
 13 files changed, 186 insertions(+), 406 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 8fa7fa458f..d683fc17e1 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -107,84 +107,38 @@ pci_vfio_write_config(const struct rte_pci_device *dev,
 
 /* get PCI BAR number where MSI-X interrupts are */
 static int
-pci_vfio_get_msix_bar(const struct rte_pci_device *dev, int fd,
+pci_vfio_get_msix_bar(const struct rte_pci_device *dev,
struct pci_msix_table *msix_table)
 {
-   int ret;
-   uint32_t reg;
-   uint16_t flags;
-   uint8_t cap_id, cap_offset;
-   uint64_t size, offset;
-
-   if (pci_vfio_get_region(dev, VFIO_PCI_CONFIG_REGION_INDEX,
-   &size, &offset) != 0) {
-   RTE_LOG(ERR, EAL, "Cannot get offset of CONFIG region.\n");
-   return -1;
-   }
+   off_t cap_offset;
 
-   /* read PCI capability pointer from config space */
-   ret = pread64(fd, ®, sizeof(reg), offset + PCI_CAPABILITY_LIST);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot read capability pointer from PCI config 
space!\n");
+   cap_offset = rte_pci_find_capability(dev, PCI_CAP_ID_MSIX);
+   if (cap_offset < 0)
return -1;
-   }
 
-   /* we need first byte */
-   cap_offset = reg & 0xFF;
+   if (cap_offset != 0) {
+   uint16_t flags;
+   uint32_t reg;
 
-   while (cap_offset) {
-
-   /* read PCI capability ID */
-   ret = pread64(fd, ®, sizeof(reg), offset + cap_offset);
-   if (ret != sizeof(reg)) {
+   /* table offset resides in the next 4 bytes */
+   if (rte_pci_read_config(dev, ®, sizeof(reg), cap_offset + 4) 
< 0) {
RTE_LOG(ERR, EAL,
-   "Cannot read capability ID from PCI config 
space!\n");
+   "Cannot read MSIX table from PCI config 
space!\n");
return -1;
}
 
-   /* we need first byte */
-   cap_id = reg & 0xFF;
-
-   /* if we haven't reached MSI-X, check next capability */
-   if (cap_id != PCI_CAP_ID_MSIX) {
-   ret = pread64(fd, ®, sizeof(reg), offset + 
cap_offset);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot read capability pointer from 
PCI config space!\n");
-   return -1;
-   }
-
-   /* we need second byte */
-   cap_offset = (reg & 0xFF00) >> 8;
-
-   continue;
+   if (rte_pci_read_config(dev, &flags, sizeof(flags), cap_offset 
+ 2) < 0) {
+   RTE_LOG(ERR, EAL,
+   "Cannot read MSIX flags from PCI config 
space!\n");
+   return -1;
}
-   /* else, read table offset */
-   else {
-   /* table offset resides in the next 4 bytes */
-   ret = pread64(fd, ®, sizeof(reg), offset + 
cap_offset + 4);
-   if (ret != sizeof(reg)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot read table offset from PCI 
config space!\n");
-   return -1;
-   }
 
-   ret = pread64(fd, &flags, sizeof(flags), offset + 
cap_offset + 2);
-   if (ret != sizeof(flags)) {
-   RTE_LOG(ERR, EAL,
-   "Cannot read table flags from PCI 
config space!\n");
-   return -1;
-   

[PATCH 04/14] pci: define some capability constants

[David Marchand]

Define some PCI capability constants and use them in existing drivers.

Signed-off-by: David Marchand 
---
 drivers/bus/pci/linux/pci_vfio.c|  2 +-
 drivers/crypto/virtio/virtio_pci.c  | 12 ++--
 drivers/event/dlb2/pf/dlb2_main.c   |  6 ++
 drivers/net/bnx2x/bnx2x.c   | 16 
 drivers/net/bnx2x/bnx2x.h   |  4 
 drivers/net/cxgbe/base/adapter.h|  3 +--
 drivers/net/gve/gve_ethdev.c|  2 +-
 drivers/net/gve/gve_ethdev.h|  2 +-
 drivers/net/hns3/hns3_ethdev_vf.c   |  2 +-
 drivers/net/virtio/virtio_pci.c | 12 ++--
 drivers/vdpa/ifc/base/ifcvf_osdep.h |  4 +++-
 lib/pci/rte_pci.h   |  5 +
 12 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index d683fc17e1..ac5a2c78b5 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -112,7 +112,7 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev,
 {
off_t cap_offset;
 
-   cap_offset = rte_pci_find_capability(dev, PCI_CAP_ID_MSIX);
+   cap_offset = rte_pci_find_capability(dev, RTE_PCI_CAP_ID_MSIX);
if (cap_offset < 0)
return -1;
 
diff --git a/drivers/crypto/virtio/virtio_pci.c 
b/drivers/crypto/virtio/virtio_pci.c
index abc52b4701..9e340f2b0d 100644
--- a/drivers/crypto/virtio/virtio_pci.c
+++ b/drivers/crypto/virtio/virtio_pci.c
@@ -14,14 +14,6 @@
 #include "virtio_pci.h"
 #include "virtqueue.h"
 
-/*
- * Following macros are derived from linux/pci_regs.h, however,
- * we can't simply include that header here, as there is no such
- * file for non-Linux platform.
- */
-#define PCI_CAP_ID_VNDR0x09
-#define PCI_CAP_ID_MSIX0x11
-
 /*
  * The remaining space is defined by each driver as the per-driver
  * configuration space.
@@ -356,7 +348,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct 
virtio_crypto_hw *hw)
 * Transitional devices would also have this capability,
 * that's why we also check if msix is enabled.
 */
-   pos = rte_pci_find_capability(dev, PCI_CAP_ID_MSIX);
+   pos = rte_pci_find_capability(dev, RTE_PCI_CAP_ID_MSIX);
if (pos > 0 && rte_pci_read_config(dev, &flags, sizeof(flags),
pos + 2) == sizeof(flags)) {
if (flags & PCI_MSIX_ENABLE)
@@ -367,7 +359,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct 
virtio_crypto_hw *hw)
hw->use_msix = VIRTIO_MSIX_NONE;
}
 
-   pos = rte_pci_find_capability(dev, PCI_CAP_ID_VNDR);
+   pos = rte_pci_find_capability(dev, RTE_PCI_CAP_ID_VNDR);
if (pos > 0 && rte_pci_read_config(dev, &cap, sizeof(cap), pos) == 
sizeof(cap)) {
VIRTIO_CRYPTO_INIT_LOG_DBG(
"[%2x] cfg type: %u, bar: %u, offset: %04x, len: %u",
diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 40e5cb594f..1a229baee0 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -38,8 +38,6 @@
 #define DLB2_PCI_EXP_DEVSTA_TRPND 0x20
 #define DLB2_PCI_EXP_DEVCTL_BCR_FLR 0x8000
 
-#define DLB2_PCI_CAP_ID_EXP   0x10
-#define DLB2_PCI_CAP_ID_MSIX  0x11
 #define DLB2_PCI_EXT_CAP_ID_PRI   0x13
 #define DLB2_PCI_EXT_CAP_ID_ACS   0xD
 
@@ -244,7 +242,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   pcie_cap_offset = rte_pci_find_capability(pdev, DLB2_PCI_CAP_ID_EXP);
+   pcie_cap_offset = rte_pci_find_capability(pdev, RTE_PCI_CAP_ID_EXP);
 
if (pcie_cap_offset < 0) {
DLB2_LOG_ERR("[%s()] failed to find the pcie capability\n",
@@ -483,7 +481,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
}
}
 
-   msix_cap_offset = rte_pci_find_capability(pdev, DLB2_PCI_CAP_ID_MSIX);
+   msix_cap_offset = rte_pci_find_capability(pdev, RTE_PCI_CAP_ID_MSIX);
if (msix_cap_offset >= 0) {
off = msix_cap_offset + DLB2_PCI_MSIX_FLAGS;
if (rte_pci_read_config(pdev, &cmd, 2, off) == 2) {
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 06f2949885..8a97de8806 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -7613,7 +7613,7 @@ static uint32_t bnx2x_pcie_capability_read(struct 
bnx2x_softc *sc, int reg)
struct bnx2x_pci_cap *caps;
 
/* ensure PCIe capability is enabled */
-   caps = pci_find_cap(sc, PCIY_EXPRESS, BNX2X_PCI_CAP);
+   caps = pci_find_cap(sc, RTE_PCI_CAP_ID_EXP, BNX2X_PCI_CAP);
if (NULL != caps) {
PMD_DRV_LOG(DEBUG, sc, "Found PCIe capability: "
"id=0x%04X type=0x%04X addr=0x%08X",
@@ -7647,7 +7647,7 @@ static void bnx2x_probe_pci_caps(struct bnx2x_softc *sc)
int reg = 0;
 
/* check if PCI Power Management is enabled */
-   caps = pci_find_cap(sc, PCIY_PMG, BNX2X

[PATCH 05/14] pci: define some MSIX constants

[David Marchand]

Define some PCI MSIX constants and use them in existing drivers.

Signed-off-by: David Marchand 
---
 drivers/bus/pci/linux/pci_init.h   | 18 --
 drivers/bus/pci/linux/pci_vfio.c   | 14 +++---
 drivers/crypto/virtio/virtio_pci.c |  6 ++
 drivers/event/dlb2/pf/dlb2_main.c  | 13 +
 drivers/net/bnx2x/bnx2x.c  |  4 ++--
 drivers/net/bnx2x/bnx2x.h  |  2 --
 drivers/net/gve/gve_ethdev.c   |  4 ++--
 drivers/net/gve/gve_ethdev.h   |  8 
 drivers/net/hns3/hns3_ethdev_vf.c  |  9 -
 drivers/net/virtio/virtio_pci.c|  6 ++
 lib/pci/rte_pci.h  | 10 ++
 11 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h
index d842809ccd..a4d37c0d0a 100644
--- a/drivers/bus/pci/linux/pci_init.h
+++ b/drivers/bus/pci/linux/pci_init.h
@@ -52,24 +52,6 @@ int pci_uio_ioport_unmap(struct rte_pci_ioport *p);
 
 #ifdef VFIO_PRESENT
 
-#ifdef PCI_MSIX_TABLE_BIR
-#define RTE_PCI_MSIX_TABLE_BIRPCI_MSIX_TABLE_BIR
-#else
-#define RTE_PCI_MSIX_TABLE_BIR0x7
-#endif
-
-#ifdef PCI_MSIX_TABLE_OFFSET
-#define RTE_PCI_MSIX_TABLE_OFFSET PCI_MSIX_TABLE_OFFSET
-#else
-#define RTE_PCI_MSIX_TABLE_OFFSET 0xfff8
-#endif
-
-#ifdef PCI_MSIX_FLAGS_QSIZE
-#define RTE_PCI_MSIX_FLAGS_QSIZE  PCI_MSIX_FLAGS_QSIZE
-#else
-#define RTE_PCI_MSIX_FLAGS_QSIZE  0x07ff
-#endif
-
 /* access config space */
 int pci_vfio_read_config(const struct rte_pci_device *dev,
 void *buf, size_t len, off_t offs);
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index ac5a2c78b5..6d13cafdcf 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -120,23 +120,23 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev,
uint16_t flags;
uint32_t reg;
 
-   /* table offset resides in the next 4 bytes */
-   if (rte_pci_read_config(dev, ®, sizeof(reg), cap_offset + 4) 
< 0) {
+   if (rte_pci_read_config(dev, ®, sizeof(reg), cap_offset +
+   RTE_PCI_MSIX_TABLE) < 0) {
RTE_LOG(ERR, EAL,
"Cannot read MSIX table from PCI config 
space!\n");
return -1;
}
 
-   if (rte_pci_read_config(dev, &flags, sizeof(flags), cap_offset 
+ 2) < 0) {
+   if (rte_pci_read_config(dev, &flags, sizeof(flags), cap_offset +
+   RTE_PCI_MSIX_FLAGS) < 0) {
RTE_LOG(ERR, EAL,
"Cannot read MSIX flags from PCI config 
space!\n");
return -1;
}
 
-   msix_table->bar_index = reg & PCI_MSIX_TABLE_BIR;
-   msix_table->offset = reg & PCI_MSIX_TABLE_OFFSET;
-   msix_table->size =
-   16 * (1 + (flags & PCI_MSIX_FLAGS_QSIZE));
+   msix_table->bar_index = reg & RTE_PCI_MSIX_TABLE_BIR;
+   msix_table->offset = reg & RTE_PCI_MSIX_TABLE_OFFSET;
+   msix_table->size = 16 * (1 + (flags & 
RTE_PCI_MSIX_FLAGS_QSIZE));
}
 
return 0;
diff --git a/drivers/crypto/virtio/virtio_pci.c 
b/drivers/crypto/virtio/virtio_pci.c
index 9e340f2b0d..c9fb1087a9 100644
--- a/drivers/crypto/virtio/virtio_pci.c
+++ b/drivers/crypto/virtio/virtio_pci.c
@@ -329,8 +329,6 @@ get_cfg_addr(struct rte_pci_device *dev, struct 
virtio_pci_cap *cap)
return base + offset;
 }
 
-#define PCI_MSIX_ENABLE 0x8000
-
 static int
 virtio_read_caps(struct rte_pci_device *dev, struct virtio_crypto_hw *hw)
 {
@@ -350,8 +348,8 @@ virtio_read_caps(struct rte_pci_device *dev, struct 
virtio_crypto_hw *hw)
 */
pos = rte_pci_find_capability(dev, RTE_PCI_CAP_ID_MSIX);
if (pos > 0 && rte_pci_read_config(dev, &flags, sizeof(flags),
-   pos + 2) == sizeof(flags)) {
-   if (flags & PCI_MSIX_ENABLE)
+   pos + RTE_PCI_MSIX_FLAGS) == sizeof(flags)) {
+   if (flags & RTE_PCI_MSIX_FLAGS_ENABLE)
hw->use_msix = VIRTIO_MSIX_ENABLED;
else
hw->use_msix = VIRTIO_MSIX_DISABLED;
diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 1a229baee0..c6606a9bee 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -44,9 +44,6 @@
 #define DLB2_PCI_PRI_CTRL_ENABLE 0x1
 #define DLB2_PCI_PRI_ALLOC_REQ   0xC
 #define DLB2_PCI_PRI_CTRL0x4
-#define DLB2_PCI_MSIX_FLAGS  0x2
-#define DLB2_PCI_MSIX_FLAGS_ENABLE   0x8000
-#define DLB2_PCI_MSIX_FLAGS_MASKALL  0x4000
 #define DLB2_PCI_ERR_ROOT_STATUS 0x30
 #define DLB2_PCI_ERR_COR_STATUS  0x10
 #define DLB2_PCI_ERR_UNCOR_STATUS0x4
@@ -483,10 +480,

[PATCH 06/14] pci: define some command constants

[David Marchand]

Define some PCI command constants and use them in existing drivers.

Signed-off-by: David Marchand 
---
 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_STATUS0x4
-#define DLB2_PCI_COMMAND_INTX_DISABLE0x400
 #define DLB2_PCI_ACS_CAP 0x4
 #define DLB2_PCI_ACS_CTRL0x6
 #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_COMMAND0x04/* 16 bits */
 
 /* PCI Command Register */
+#define RTE_PCI_COMMAND0x04/* 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

[PATCH 07/14] pci: define some BAR constants

[David Marchand]

Define some PCI BAR constants and use them in existing drivers.

Signed-off-by: David Marchand 
---
 drivers/bus/pci/linux/pci_vfio.c | 7 +++
 lib/pci/rte_pci.h| 4 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index f96b3ce7fb..c2e3d2f4b5 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -5,7 +5,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -430,14 +429,14 @@ pci_vfio_is_ioport_bar(const struct rte_pci_device *dev, 
int vfio_dev_fd,
}
 
ret = pread64(vfio_dev_fd, &ioport_bar, sizeof(ioport_bar),
- offset + PCI_BASE_ADDRESS_0 + bar_index * 4);
+ offset + RTE_PCI_BASE_ADDRESS_0 + bar_index * 4);
if (ret != sizeof(ioport_bar)) {
RTE_LOG(ERR, EAL, "Cannot read command (%x) from config 
space!\n",
-   PCI_BASE_ADDRESS_0 + bar_index*4);
+   RTE_PCI_BASE_ADDRESS_0 + bar_index*4);
return -1;
}
 
-   return (ioport_bar & PCI_BASE_ADDRESS_SPACE_IO) != 0;
+   return (ioport_bar & RTE_PCI_BASE_ADDRESS_SPACE_IO) != 0;
 }
 
 static int
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index bf2b2639f4..429904cff9 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -43,6 +43,10 @@ extern "C" {
 #define RTE_PCI_STATUS 0x06/* 16 bits */
 #define RTE_PCI_STATUS_CAP_LIST0x10/* Support Capability List */
 
+/* Base addresses */
+#define RTE_PCI_BASE_ADDRESS_0 0x10/* 32 bits */
+#define RTE_PCI_BASE_ADDRESS_SPACE_IO  0x01
+
 /* Capability registers */
 #define RTE_PCI_CAPABILITY_LIST0x34/* Offset of first capability 
list entry */
 #define RTE_PCI_CAP_ID_PM  0x01/* Power Management */
-- 
2.41.0

[PATCH 08/14] pci: define some PM constants

[David Marchand]

Define some PCI Power Management constants and use them in existing
drivers.

Signed-off-by: David Marchand 
---
 drivers/net/bnx2x/bnx2x.c | 17 +
 drivers/net/bnx2x/bnx2x.h |  5 -
 lib/pci/rte_pci.h |  6 ++
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index e3f14400cc..faf061beba 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -5843,17 +5843,17 @@ static int bnx2x_set_power_state(struct bnx2x_softc 
*sc, uint8_t state)
return 0;
}
 
-   pci_read(sc, (sc->devinfo.pcie_pm_cap_reg + PCIR_POWER_STATUS), &pmcsr,
+   pci_read(sc, (sc->devinfo.pcie_pm_cap_reg + RTE_PCI_PM_CTRL), &pmcsr,
 2);
 
switch (state) {
case PCI_PM_D0:
pci_write_word(sc,
   (sc->devinfo.pcie_pm_cap_reg +
-   PCIR_POWER_STATUS),
-  ((pmcsr & ~PCIM_PSTAT_DMASK) | PCIM_PSTAT_PME));
+   RTE_PCI_PM_CTRL),
+  ((pmcsr & ~RTE_PCI_PM_CTRL_STATE_MASK) | 
RTE_PCI_PM_CTRL_PME_STATUS));
 
-   if (pmcsr & PCIM_PSTAT_DMASK) {
+   if (pmcsr & RTE_PCI_PM_CTRL_STATE_MASK) {
/* delay required during transition out of D3hot */
DELAY(2);
}
@@ -5866,16 +5866,17 @@ static int bnx2x_set_power_state(struct bnx2x_softc 
*sc, uint8_t state)
return 0;
}
 
-   pmcsr &= ~PCIM_PSTAT_DMASK;
-   pmcsr |= PCIM_PSTAT_D3;
+   pmcsr &= ~RTE_PCI_PM_CTRL_STATE_MASK;
+   /* D3 power state */
+   pmcsr |= 0x3;
 
if (sc->wol) {
-   pmcsr |= PCIM_PSTAT_PMEENABLE;
+   pmcsr |= RTE_PCI_PM_CTRL_PME_ENABLE;
}
 
pci_write_long(sc,
   (sc->devinfo.pcie_pm_cap_reg +
-   PCIR_POWER_STATUS), pmcsr);
+   RTE_PCI_PM_CTRL), pmcsr);
 
/*
 * No more memory access after this point until device is 
brought back
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 60af75d336..1efa166316 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -41,11 +41,6 @@
 #define PCIR_EXPRESS_DEVICE_CTLPCI_EXP_DEVCTL
 #define PCIM_EXP_CTL_MAX_PAYLOAD   PCI_EXP_DEVCTL_PAYLOAD
 #define PCIM_EXP_CTL_MAX_READ_REQUEST  PCI_EXP_DEVCTL_READRQ
-#define PCIR_POWER_STATUS  PCI_PM_CTRL
-#define PCIM_PSTAT_DMASK   PCI_PM_CTRL_STATE_MASK
-#define PCIM_PSTAT_PME PCI_PM_CTRL_PME_STATUS
-#define PCIM_PSTAT_D3  0x3
-#define PCIM_PSTAT_PMEENABLE   PCI_PM_CTRL_PME_ENABLE
 #else
 #include 
 #endif
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 429904cff9..b7e1ff5d78 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -56,6 +56,12 @@ extern "C" {
 #define RTE_PCI_CAP_ID_MSIX0x11/* MSI-X */
 #define RTE_PCI_CAP_SIZEOF 4
 
+/* Power Management Registers */
+#define RTE_PCI_PM_CTRL4   /* PM control and 
status register */
+#define RTE_PCI_PM_CTRL_STATE_MASK 0x0003  /* Current power state (D0 to 
D3) */
+#define RTE_PCI_PM_CTRL_PME_ENABLE 0x0100  /* PME pin enable */
+#define RTE_PCI_PM_CTRL_PME_STATUS 0x8000  /* PME pin status */
+
 /* MSI-X registers */
 #define RTE_PCI_MSIX_FLAGS 2   /* Message Control */
 #define RTE_PCI_MSIX_FLAGS_QSIZE   0x07ff  /* Table size */
-- 
2.41.0

[PATCH 09/14] pci: define some PCIe constants

[David Marchand]

Define some PCI Express constants and use them in existing drivers.

Signed-off-by: David Marchand 
---
 drivers/event/dlb2/pf/dlb2_main.c | 40 ---
 drivers/net/bnx2x/bnx2x.c | 16 ++---
 drivers/net/bnx2x/bnx2x.h | 35 ---
 lib/pci/rte_pci.h | 17 -
 4 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 6dbaa2ff97..8d960edef6 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -27,16 +27,6 @@
 #define NO_OWNER_VF 0  /* PF ONLY! */
 #define NOT_VF_REQ false /* PF ONLY! */
 
-#define DLB2_PCI_LNKCTL 16
-#define DLB2_PCI_SLTCTL 24
-#define DLB2_PCI_RTCTL 28
-#define DLB2_PCI_EXP_DEVCTL2 40
-#define DLB2_PCI_LNKCTL2 48
-#define DLB2_PCI_SLTCTL2 56
-#define DLB2_PCI_EXP_DEVSTA 10
-#define DLB2_PCI_EXP_DEVSTA_TRPND 0x20
-#define DLB2_PCI_EXP_DEVCTL_BCR_FLR 0x8000
-
 #define DLB2_PCI_EXT_CAP_ID_PRI   0x13
 #define DLB2_PCI_EXT_CAP_ID_ACS   0xD
 
@@ -249,27 +239,27 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
if (rte_pci_read_config(pdev, &dev_ctl_word, 2, off) != 2)
dev_ctl_word = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_LNKCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_LNKCTL;
if (rte_pci_read_config(pdev, &lnk_word, 2, off) != 2)
lnk_word = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_SLTCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_SLTCTL;
if (rte_pci_read_config(pdev, &slt_word, 2, off) != 2)
slt_word = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_RTCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_RTCTL;
if (rte_pci_read_config(pdev, &rt_ctl_word, 2, off) != 2)
rt_ctl_word = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_EXP_DEVCTL2;
+   off = pcie_cap_offset + RTE_PCI_EXP_DEVCTL2;
if (rte_pci_read_config(pdev, &dev_ctl2_word, 2, off) != 2)
dev_ctl2_word = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_LNKCTL2;
+   off = pcie_cap_offset + RTE_PCI_EXP_LNKCTL2;
if (rte_pci_read_config(pdev, &lnk_word2, 2, off) != 2)
lnk_word2 = 0;
 
-   off = pcie_cap_offset + DLB2_PCI_SLTCTL2;
+   off = pcie_cap_offset + RTE_PCI_EXP_SLTCTL2;
if (rte_pci_read_config(pdev, &slt_word2, 2, off) != 2)
slt_word2 = 0;
 
@@ -296,7 +286,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
for (wait_count = 0; wait_count < 4; wait_count++) {
int sleep_time;
 
-   off = pcie_cap_offset + DLB2_PCI_EXP_DEVSTA;
+   off = pcie_cap_offset + RTE_PCI_EXP_DEVSTA;
ret = rte_pci_read_config(pdev, &devsta_busy_word, 2, off);
if (ret != 2) {
DLB2_LOG_ERR("[%s()] failed to read the pci device 
status\n",
@@ -304,7 +294,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   if (!(devsta_busy_word & DLB2_PCI_EXP_DEVSTA_TRPND))
+   if (!(devsta_busy_word & RTE_PCI_EXP_DEVSTA_TRPND))
break;
 
sleep_time = (1 << (wait_count)) * 100;
@@ -325,7 +315,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   devctl_word |= DLB2_PCI_EXP_DEVCTL_BCR_FLR;
+   devctl_word |= RTE_PCI_EXP_DEVCTL_BCR_FLR;
 
ret = rte_pci_write_config(pdev, &devctl_word, 2, off);
if (ret != 2) {
@@ -347,7 +337,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = pcie_cap_offset + DLB2_PCI_LNKCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_LNKCTL;
ret = rte_pci_write_config(pdev, &lnk_word, 2, off);
if (ret != 2) {
DLB2_LOG_ERR("[%s()] failed to write the pcie config 
space at offset %d\n",
@@ -355,7 +345,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = pcie_cap_offset + DLB2_PCI_SLTCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_SLTCTL;
ret = rte_pci_write_config(pdev, &slt_word, 2, off);
if (ret != 2) {
DLB2_LOG_ERR("[%s()] failed to write the pcie config 
space at offset %d\n",
@@ -363,7 +353,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = pcie_cap_offset + DLB2_PCI_RTCTL;
+   off = pcie_cap_offset + RTE_PCI_EXP_RTCTL;
ret = rte_pci_write_config(pdev, &rt_ctl_word, 2, off);
if (ret != 2) {
DLB2_LOG_ERR("[%s()] failed to write the pcie config 
space at offset %d\n",
@@ -371,7 +361,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-  

[PATCH 10/14] pci: define some extended capability constants

[David Marchand]

Define some PCI extended capability constants and use them in existing
drivers.

Signed-off-by: David Marchand 
---
 drivers/event/dlb2/pf/dlb2_main.c | 7 ++-
 lib/pci/rte_pci.h | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 8d960edef6..29e3001627 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -27,9 +27,6 @@
 #define NO_OWNER_VF 0  /* PF ONLY! */
 #define NOT_VF_REQ false /* PF ONLY! */
 
-#define DLB2_PCI_EXT_CAP_ID_PRI   0x13
-#define DLB2_PCI_EXT_CAP_ID_ACS   0xD
-
 #define DLB2_PCI_PRI_CTRL_ENABLE 0x1
 #define DLB2_PCI_PRI_ALLOC_REQ   0xC
 #define DLB2_PCI_PRI_CTRL0x4
@@ -263,7 +260,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
if (rte_pci_read_config(pdev, &slt_word2, 2, off) != 2)
slt_word2 = 0;
 
-   off = DLB2_PCI_EXT_CAP_ID_PRI;
+   off = RTE_PCI_EXT_CAP_ID_PRI;
pri_cap_offset = rte_pci_find_ext_capability(pdev, off);
 
if (pri_cap_offset >= 0) {
@@ -490,7 +487,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
}
}
 
-   off = DLB2_PCI_EXT_CAP_ID_ACS;
+   off = RTE_PCI_EXT_CAP_ID_ACS;
acs_cap_offset = rte_pci_find_ext_capability(pdev, off);
 
if (acs_cap_offset >= 0) {
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index a83f6abe14..67b34a0af2 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -96,7 +96,9 @@ extern "C" {
 
 #define RTE_PCI_EXT_CAP_ID_ERR 0x01/* Advanced Error Reporting */
 #define RTE_PCI_EXT_CAP_ID_DSN 0x03/* Device Serial Number */
+#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 */
 
 /* Single Root I/O Virtualization */
 #define RTE_PCI_SRIOV_CAP  0x04/* SR-IOV Capabilities */
-- 
2.41.0

[PATCH 11/14] pci: define some ACS constants

[David Marchand]

Define some PCI ACS extended feature constants and use them in existing
drivers.

Signed-off-by: David Marchand 
---
 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_STATUS0x4
-#define DLB2_PCI_ACS_CAP 0x4
-#define DLB2_PCI_ACS_CTRL0x6
-#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 67b34a0af2..315c37571d 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -100,6 +100,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 */
+#define RTE_PCI_ACS_CAP0x04/* 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 */
 #define RTE_PCI_SRIOV_CAP  0x04/* SR-IOV Capabilities */
 #define RTE_PCI_SRIOV_CTRL 0x08/* SR-IOV Control */
-- 
2.41.0

[PATCH 12/14] pci: define some PRI constants

[David Marchand]

Define some PCI PRI extended feature constants and use them in existing
drivers.

Signed-off-by: David Marchand 
---
 drivers/event/dlb2/pf/dlb2_main.c | 11 ---
 lib/pci/rte_pci.h |  5 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 8e729d1964..187a356c24 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -27,9 +27,6 @@
 #define NO_OWNER_VF 0  /* PF ONLY! */
 #define NOT_VF_REQ false /* PF ONLY! */
 
-#define DLB2_PCI_PRI_CTRL_ENABLE 0x1
-#define DLB2_PCI_PRI_ALLOC_REQ   0xC
-#define DLB2_PCI_PRI_CTRL0x4
 #define DLB2_PCI_ERR_ROOT_STATUS 0x30
 #define DLB2_PCI_ERR_COR_STATUS  0x10
 #define DLB2_PCI_ERR_UNCOR_STATUS0x4
@@ -257,7 +254,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
pri_cap_offset = rte_pci_find_ext_capability(pdev, off);
 
if (pri_cap_offset >= 0) {
-   off = pri_cap_offset + DLB2_PCI_PRI_ALLOC_REQ;
+   off = pri_cap_offset + RTE_PCI_PRI_ALLOC_REQ;
if (rte_pci_read_config(pdev, &pri_reqs_dword, 4, off) != 4)
pri_reqs_dword = 0;
}
@@ -377,9 +374,9 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
}
 
if (pri_cap_offset >= 0) {
-   pri_ctrl_word = DLB2_PCI_PRI_CTRL_ENABLE;
+   pri_ctrl_word = RTE_PCI_PRI_CTRL_ENABLE;
 
-   off = pri_cap_offset + DLB2_PCI_PRI_ALLOC_REQ;
+   off = pri_cap_offset + RTE_PCI_PRI_ALLOC_REQ;
ret = rte_pci_write_config(pdev, &pri_reqs_dword, 4, off);
if (ret != 4) {
DLB2_LOG_ERR("[%s()] failed to write the pcie config 
space at offset %d\n",
@@ -387,7 +384,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = pri_cap_offset + DLB2_PCI_PRI_CTRL;
+   off = pri_cap_offset + RTE_PCI_PRI_CTRL;
ret = rte_pci_write_config(pdev, &pri_ctrl_word, 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 315c37571d..0dc8733e1d 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -121,6 +121,11 @@ extern "C" {
 #define RTE_PCI_SRIOV_VF_DID   0x1a/* VF Device ID */
 #define RTE_PCI_SRIOV_SUP_PGSIZE   0x1c/* Supported Page Sizes */
 
+/* Page Request Interface */
+#define RTE_PCI_PRI_CTRL   0x04/* PRI control register */
+#define RTE_PCI_PRI_CTRL_ENABLE0x0001  /* Enable */
+#define RTE_PCI_PRI_ALLOC_REQ  0x0c/* PRI max reqs allowed */
+
 /** Formatting string for PCI device identifier: Ex: :00:01.0 */
 #define PCI_PRI_FMT "%.4" PRIx32 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
 #define PCI_PRI_STR_SIZE sizeof(":XX:XX.X")
-- 
2.41.0

[PATCH 13/14] pci: define some AER constants

[David Marchand]

Define some Advanced Error Reporting constants and use them in existing
drivers.

Signed-off-by: David Marchand 
---
 drivers/event/dlb2/pf/dlb2_main.c | 10 +++---
 lib/pci/rte_pci.h |  5 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/event/dlb2/pf/dlb2_main.c 
b/drivers/event/dlb2/pf/dlb2_main.c
index 187a356c24..aa03e4c311 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -27,10 +27,6 @@
 #define NO_OWNER_VF 0  /* PF ONLY! */
 #define NOT_VF_REQ false /* PF ONLY! */
 
-#define DLB2_PCI_ERR_ROOT_STATUS 0x30
-#define DLB2_PCI_ERR_COR_STATUS  0x10
-#define DLB2_PCI_ERR_UNCOR_STATUS0x4
-
 static int
 dlb2_pf_init_driver_state(struct dlb2_dev *dlb2_dev)
 {
@@ -399,7 +395,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
if (err_cap_offset >= 0) {
uint32_t tmp;
 
-   off = err_cap_offset + DLB2_PCI_ERR_ROOT_STATUS;
+   off = err_cap_offset + RTE_PCI_ERR_ROOT_STATUS;
if (rte_pci_read_config(pdev, &tmp, 4, off) != 4)
tmp = 0;
 
@@ -410,7 +406,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = err_cap_offset + DLB2_PCI_ERR_COR_STATUS;
+   off = err_cap_offset + RTE_PCI_ERR_COR_STATUS;
if (rte_pci_read_config(pdev, &tmp, 4, off) != 4)
tmp = 0;
 
@@ -421,7 +417,7 @@ dlb2_pf_reset(struct dlb2_dev *dlb2_dev)
return ret;
}
 
-   off = err_cap_offset + DLB2_PCI_ERR_UNCOR_STATUS;
+   off = err_cap_offset + RTE_PCI_ERR_UNCOR_STATUS;
if (rte_pci_read_config(pdev, &tmp, 4, off) != 4)
tmp = 0;
 
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 0dc8733e1d..c7552a53eb 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -100,6 +100,11 @@ extern "C" {
 #define RTE_PCI_EXT_CAP_ID_SRIOV   0x10/* SR-IOV*/
 #define RTE_PCI_EXT_CAP_ID_PRI 0x13/* Page Request Interface */
 
+/* Advanced Error Reporting */
+#define RTE_PCI_ERR_UNCOR_STATUS   0x04/* Uncorrectable Error Status */
+#define RTE_PCI_ERR_COR_STATUS 0x10/* Correctable Error Status */
+#define RTE_PCI_ERR_ROOT_STATUS0x30
+
 /* Access Control Service */
 #define RTE_PCI_ACS_CAP0x04/* ACS Capability 
Register */
 #define RTE_PCI_ACS_CTRL   0x06/* ACS Control Register */
-- 
2.41.0

[PATCH 14/14] devtools: forbid inclusion of Linux header for PCI

[David Marchand]

Refrain from including Linux-only pci_regs.h header.
Instead, prefer our own definitions from the pci library.

Signed-off-by: David Marchand 
---
 devtools/checkpatches.sh | 8 
 1 file changed, 8 insertions(+)

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 43f5e36a18..5d3c5aaba5 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -127,6 +127,14 @@ check_forbidden_additions() { # 
-f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
"$1" || res=1
 
+   # forbid inclusion of Linux header for PCI constants
+   awk -v FOLDERS="lib drivers app examples" \
+   -v EXPRESSIONS='include.*linux/pci_regs\\.h' \
+   -v RET_ON_FAIL=1 \
+   -v MESSAGE='Using linux/pci_regs.h, prefer rte_pci.h' \
+   -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+   "$1" || res=1
+
# forbid use of experimental build flag except in examples
awk -v FOLDERS='lib drivers app' \
-v EXPRESSIONS='-DALLOW_EXPERIMENTAL_API 
allow_experimental_apis' \
-- 
2.41.0

Re: [PATCH v4] dmadev: add tracepoints

[fengchengwen]

Hi Thomas,

On 2023/7/31 20:48, Thomas Monjalon wrote:
> 10/07/2023 09:50, fengchengwen:
>> Hi Thomas,
>>
>> On 2023/7/10 14:49, Thomas Monjalon wrote:
>>> 09/07/2023 05:23, fengchengwen:
 Hi Thomas,

 On 2023/7/7 18:40, Thomas Monjalon wrote:
> 26/05/2023 10:42, Chengwen Feng:
>> Add tracepoints at important APIs for tracing support.
>>
>> Signed-off-by: Chengwen Feng 
>> Acked-by: Morten Brørup 
>>
>> ---
>> v4: Fix asan smoke fail.
>> v3: Address Morten's comment:
>> Move stats_get and vchan_status and to trace_fp.h.
>> v2: Address Morten's comment:
>> Make stats_get as fast-path trace-points.
>> Place fast-path trace-point functions behind in version.map.
>
> There are more things to fix.
> First you must export rte_dmadev_trace_fp.h as it is included by 
> rte_dmadev.h.

 It was already included by rte_dmadev.h:
 diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
 index e61d71959e..e792b90ef8 100644
 --- a/lib/dmadev/rte_dmadev.h
 +++ b/lib/dmadev/rte_dmadev.h
 @@ -796,6 +796,7 @@ struct rte_dma_sge {
  };

  #include "rte_dmadev_core.h"
 +#include "rte_dmadev_trace_fp.h"


> Note: you could have caught this if testing the example app for DMA.
> Second, you must avoid structs and enum in this header file,

 Let me explain the #if #endif logic:

 For the function:
 uint16_t
 rte_dma_completed(int16_t dev_id, uint16_t vchan, const uint16_t nb_cpls,
  uint16_t *last_idx, bool *has_error)

 The common trace implementation:
 RTE_TRACE_POINT_FP(
rte_dma_trace_completed,
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
 const uint16_t nb_cpls, uint16_t *last_idx,
 bool *has_error, uint16_t ret),
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
rte_trace_point_emit_ptr(idx_val);
rte_trace_point_emit_ptr(has_error);
rte_trace_point_emit_u16(ret);
 )

 But it has a problem: for pointer parameter (e.g. last_idx and has_error), 
 only record
 the pointer value (i.e. address value).

 I think the pointer value has no mean (in particular, many of there 
 pointers are stack
 variables), the value of the pointer point to is meaningful.

 So I add the pointer reference like below (as V3 did):
 RTE_TRACE_POINT_FP(
rte_dma_trace_completed,
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
 const uint16_t nb_cpls, uint16_t *last_idx,
 bool *has_error, uint16_t ret),
int has_error_val = *has_error;// pointer reference
int last_idx_val = *last_idx;  // pointer reference
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
rte_trace_point_emit_int(last_idx_val);// record the value of 
 pointer
rte_trace_point_emit_int(has_error_val);   // record the value of 
 pointer
rte_trace_point_emit_u16(ret);
 )

 Unfortunately, the above lead to asan failed. because in:
 RTE_TRACE_POINT_REGISTER(rte_dma_trace_completed,
lib.dmadev.completed)
 it will invoke rte_dma_trace_completed() with the parameter is undefined.


 To solve this problem, consider the rte_dmadev_trace_points.c will include 
 rte_trace_point_register.h,
 and the rte_trace_point_register.h will defined macro: 
 _RTE_TRACE_POINT_REGISTER_H_.

 so we update trace points as (as V4 did):
 RTE_TRACE_POINT_FP(
rte_dma_trace_completed,
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
 const uint16_t nb_cpls, uint16_t *last_idx,
 bool *has_error, uint16_t ret),
 #ifdef _RTE_TRACE_POINT_REGISTER_H_
uint16_t __last_idx = 0;
bool __has_error = false;
last_idx = &__last_idx;  // make sure the pointer has 
 meaningful value.
has_error = &__has_error;// so that the next pointer 
 reference will work well.
 #endif /* _RTE_TRACE_POINT_REGISTER_H_ */
int has_error_val = *has_error;
int last_idx_val = *last_idx;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
rte_trace_point_emit_int(last_idx_val);
rte_trace_point_emit_int(has_error_val);
rte_trace_point_emit_u16(ret);
 )

> otherwise it cannot be included alone.
> Look at what is done in other *_trace_fp.h files.
>
>

 Whether enable_trace_fp is true or false, the v4 work well.
 Below is that run examples with enab

[PATCH v3 0/8] [v3] drivers/net Add Support mucse N10 Pmd Driver

[Wenbo Cao]

For This patchset just to support the basic chip init work
and user can just found the eth_dev, but can't control more.
For Now just support 2*10g nic,the chip can support
2*10g,4*10g,4*1g,8*1g,8*10g.
The Feature rx side can support rx-cksum-offload,rss,vlan-filter
flow_clow,uncast_filter,mcast_filter,1588,Jumbo-frame
The Feature tx side can supprt tx-cksum-offload,tso,vxlan-tso 
flow director base on ntuple pattern of tcp/udp/ip/ eth_hdr->type
for sriov is also support.

Because of the chip desgin defect, for multiple-port mode
one pci-bdf will have multiple-port (max can have four ports)
so this code must be care of one bdf init multiple-port.

v3:
  * fixed http://dpdk.org/patch/129830 FreeBSD 13 compile Issue
  * change iobar type to void suggest by Stephen Hemminger
  * add KMOD_DEP support for vfio-pci
  * change run-cmd argument parse check for invalid extra_args

v2:
  * fixed MAINTAIN maillist fullname format
  * fixed driver/net/meson the order issue of new driver to driver list
  * improve virtual point function usage suggest by Stephen Hemminger

Wenbo Cao (8):
  net/rnp: add ethdev probe and remove
  net/rnp: add ethdev probe and remove
  net/rnp: add device init and uninit
  net/rnp: add mbx basic api feature
  net/rnp add reset code for Chip Init process
  net/rnp add port info resource init
  net/rnp add devargs runtime parsing functions
  net/rnp handle device interrupts

 drivers/net/rnp/base/rnp_api.c  |  71 +++
 drivers/net/rnp/base/rnp_api.h  |  17 +
 drivers/net/rnp/base/rnp_cfg.h  |   7 +
 drivers/net/rnp/base/rnp_dma_regs.h |  73 +++
 drivers/net/rnp/base/rnp_eth_regs.h | 124 +
 drivers/net/rnp/base/rnp_hw.h   | 206 +++
 drivers/net/rnp/base/rnp_mac_regs.h | 279 ++
 drivers/net/rnp/meson.build |   6 +
 drivers/net/rnp/rnp.h   | 218 
 drivers/net/rnp/rnp_ethdev.c| 819 
 drivers/net/rnp/rnp_logs.h  |  43 ++
 drivers/net/rnp/rnp_mbx.c   | 524 ++
 drivers/net/rnp/rnp_mbx.h   | 140 +
 drivers/net/rnp/rnp_mbx_fw.c| 781 ++
 drivers/net/rnp/rnp_mbx_fw.h| 401 ++
 drivers/net/rnp/rnp_osdep.h |  30 +
 drivers/net/rnp/rnp_rxtx.c  |  83 +++
 drivers/net/rnp/rnp_rxtx.h  |  14 +
 18 files changed, 3836 insertions(+)
 create mode 100644 drivers/net/rnp/base/rnp_api.c
 create mode 100644 drivers/net/rnp/base/rnp_api.h
 create mode 100644 drivers/net/rnp/base/rnp_cfg.h
 create mode 100644 drivers/net/rnp/base/rnp_dma_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_eth_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_hw.h
 create mode 100644 drivers/net/rnp/base/rnp_mac_regs.h
 create mode 100644 drivers/net/rnp/rnp.h
 create mode 100644 drivers/net/rnp/rnp_logs.h
 create mode 100644 drivers/net/rnp/rnp_mbx.c
 create mode 100644 drivers/net/rnp/rnp_mbx.h
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.c
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.h
 create mode 100644 drivers/net/rnp/rnp_osdep.h
 create mode 100644 drivers/net/rnp/rnp_rxtx.c
 create mode 100644 drivers/net/rnp/rnp_rxtx.h

-- 
2.27.0

[PATCH v3 2/8] net/rnp: add ethdev probe and remove

[Wenbo Cao]

Add basic PCIe ethdev probe and remove.

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/rnp_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 5951c2b311..390f2e7743 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -83,4 +83,4 @@ static struct rte_pci_driver rte_rnp_pmd = {
 
 RTE_PMD_REGISTER_PCI(net_rnp, rte_rnp_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_rnp, pci_id_rnp_map);
-RTE_PMD_REGISTER_KMOD_DEP(net_txgbe, "igb_uio | uio_pci_generic");
+RTE_PMD_REGISTER_KMOD_DEP(net_rnp, "igb_uio | uio_pci_generic | vfio-pci");
-- 
2.27.0

[PATCH v3 1/8] net/rnp: add ethdev probe and remove

[Wenbo Cao]

Add basic PCIe ethdev probe and remove.

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/rnp.h| 13 ++
 drivers/net/rnp/rnp_ethdev.c | 83 
 2 files changed, 96 insertions(+)
 create mode 100644 drivers/net/rnp/rnp.h

diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
new file mode 100644
index 00..76d281cc0a
--- /dev/null
+++ b/drivers/net/rnp/rnp.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Mucse IC Design Ltd.
+ */
+#ifndef __RNP_H__
+#define __RNP_H__
+
+#define PCI_VENDOR_ID_MUCSE(0x8848)
+#define RNP_DEV_ID_N10G(0x1000)
+
+struct rnp_eth_port {
+} __rte_cache_aligned;
+
+#endif /* __RNP_H__ */
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 9ce3c0b497..5951c2b311 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -1,3 +1,86 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(C) 2023 Mucse IC Design Ltd.
  */
+
+#include 
+#include 
+#include 
+
+#include "rnp.h"
+
+static int
+rnp_eth_dev_init(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+
+   return -ENODEV;
+}
+
+static int
+rnp_eth_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+
+   return -ENODEV;
+}
+
+static int
+rnp_pci_remove(struct rte_pci_device *pci_dev)
+{
+   struct rte_eth_dev *eth_dev;
+   int rc;
+
+   eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+
+   if (eth_dev) {
+   /* Cleanup eth dev */
+   rc = rte_eth_dev_pci_generic_remove(pci_dev,
+   rnp_eth_dev_uninit);
+   if (rc)
+   return rc;
+   }
+   /* Nothing to be done for secondary processes */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return 0;
+
+   return 0;
+}
+
+static int
+rnp_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+   int rc;
+
+   RTE_SET_USED(pci_drv);
+
+   rc = rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct rnp_eth_port),
+  rnp_eth_dev_init);
+
+   /* On error on secondary, recheck if port exists in primary or
+* in mid of detach state.
+*/
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY && rc)
+   if (!rte_eth_dev_allocated(pci_dev->device.name))
+   return 0;
+   return rc;
+}
+
+static const struct rte_pci_id pci_id_rnp_map[] = {
+   {
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_MUCSE, RNP_DEV_ID_N10G)
+   },
+   {
+   .vendor_id = 0,
+   },
+};
+
+static struct rte_pci_driver rte_rnp_pmd = {
+   .id_table = pci_id_rnp_map,
+   .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+   .probe = rnp_pci_probe,
+   .remove = rnp_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_rnp, rte_rnp_pmd);
+RTE_PMD_REGISTER_PCI_TABLE(net_rnp, pci_id_rnp_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_txgbe, "igb_uio | uio_pci_generic");
-- 
2.27.0

[PATCH v3 5/8] net/rnp add reset code for Chip Init process

[Wenbo Cao]

we must get the shape info of nic from Firmware for
reset. so the related codes is first get firmware info
and then reset the chip

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h |  56 +++-
 drivers/net/rnp/meson.build   |   3 +
 drivers/net/rnp/rnp.h |  27 ++
 drivers/net/rnp/rnp_ethdev.c  |  93 ++-
 drivers/net/rnp/rnp_mbx_fw.h  | 163 +-
 5 files changed, 339 insertions(+), 3 deletions(-)

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 1db966cf21..57b7dc75a0 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -8,6 +8,9 @@
 #include 
 
 #include "rnp_osdep.h"
+#include "rnp_dma_regs.h"
+#include "rnp_eth_regs.h"
+#include "rnp_cfg.h"
 
 static inline unsigned int rnp_rd_reg(volatile void *addr)
 {
@@ -29,7 +32,18 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_rd_reg((uint8_t *)(_base) + (_off))
 #define rnp_io_wr(_base, _off, _val)   \
rnp_wr_reg((uint8_t *)(_base) + (_off), (_val))
-
+#define rnp_eth_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->eth_base) + (_off))
+#define rnp_eth_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->eth_base) + (_off), (_val))
+#define rnp_dma_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->dma_base) + (_off))
+#define rnp_dma_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->dma_base) + (_off), (_val))
+#define rnp_top_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->comm_reg_base) + (_off))
+#define rnp_top_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->comm_reg_base) + (_off), (_val))
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
@@ -98,6 +112,17 @@ struct rnp_mbx_info {
rte_atomic16_t state;
 } __rte_cache_aligned;
 
+struct rnp_mac_api {
+   int32_t (*init_hw)(struct rnp_hw *hw);
+   int32_t (*reset_hw)(struct rnp_hw *hw);
+};
+
+struct rnp_mac_info {
+   uint8_t assign_addr[RTE_ETHER_ADDR_LEN];
+   uint8_t set_addr[RTE_ETHER_ADDR_LEN];
+   struct rnp_mac_api ops;
+} __rte_cache_aligned;
+
 struct rnp_eth_adapter;
 #define RNP_MAX_HW_PORT_PERR_PF (4)
 struct rnp_hw {
@@ -111,8 +136,10 @@ struct rnp_hw {
void *eth_base;
void *veb_base;
void *mac_base[RNP_MAX_HW_PORT_PERR_PF];
+   void *comm_reg_base;
void *msix_base;
/* === dma == */
+   void *dev_version;
void *dma_axi_en;
void *dma_axi_st;
 
@@ -120,10 +147,37 @@ struct rnp_hw {
uint16_t vendor_id;
uint16_t function;
uint16_t pf_vf_num;
+   int pfvfnum;
uint16_t max_vfs;
+
+   bool ncsi_en;
+   uint8_t ncsi_rar_entries;
+
+   int sgmii_phy_id;
+   int is_sgmii;
+   u16 phy_type;
+   uint8_t force_10g_1g_speed_ablity;
+   uint8_t force_speed_stat;
+#define FORCE_SPEED_STAT_DISABLED   (0)
+#define FORCE_SPEED_STAT_1G (1)
+#define FORCE_SPEED_STAT_10G(2)
+   uint32_t speed;
+   unsigned int axi_mhz;
+
+   int fw_version;  /* Primary FW Version */
+   uint32_t fw_uid; /* Subclass Fw Version */
+
+   int nic_mode;
+   unsigned char lane_mask;
+   int lane_of_port[4];
+   char phy_port_ids[4]; /* port id: for lane0~3: value: 0 ~ 7 */
+   uint8_t max_port_num; /* Max Port Num This PF Have */
+
void *cookie_pool;
char cookie_p_name[RTE_MEMZONE_NAMESIZE];
 
+   struct rnp_mac_info mac;
struct rnp_mbx_info mbx;
+   rte_spinlock_t fw_lock;
 } __rte_cache_aligned;
 #endif /* __RNP_H__*/
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index 38dbee5ca4..c52566c357 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -10,5 +10,8 @@ endif
 sources = files(
'rnp_ethdev.c',
'rnp_mbx.c',
+   'rnp_mbx_fw.c',
+   'base/rnp_api.c',
 )
+
 includes += include_directories('base')
diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 086667cec1..f6c9231eb1 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -13,6 +13,20 @@
 #define RNP_CFG_BAR(4)
 #define RNP_PF_INFO_BAR(0)
 
+enum rnp_resource_share_m {
+   RNP_SHARE_CORPORATE = 0,
+   RNP_SHARE_INDEPEND,
+};
+/*
+ * Structure to store private data for each driver instance (for each port).
+ */
+enum rnp_work_mode {
+   RNP_SINGLE_40G = 0,
+   RNP_SINGLE_10G = 1,
+   RNP_DUAL_10G = 2,
+   RNP_QUAD_10G = 3,
+};
+
 struct rnp_eth_port {
struct rnp_eth_adapter *adapt;
struct rnp_hw *hw;
@@ -21,9 +35,12 @@ struct rnp_eth_port {
 
 struct rnp_share_ops {
const struct rnp_mbx_api *mbx_api;
+   const struct rnp_mac_api *mac_api;
 } __rte_cache_aligned;
 
 struct rnp_eth_adapter {
+   enum rnp_work_mode mode;
+   enum rnp_resource_share_m s_mode; /* Port Resource Sha

[PATCH v3 6/8] net/rnp add port info resource init

[Wenbo Cao]

Add Api For FW Mac Info, Port Resoucre info init Code
For Different Shape Of Nic

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_api.c |  48 +++
 drivers/net/rnp/base/rnp_api.h |  10 ++
 drivers/net/rnp/base/rnp_hw.h  |  18 +++
 drivers/net/rnp/meson.build|   1 +
 drivers/net/rnp/rnp.h  |  88 +
 drivers/net/rnp/rnp_ethdev.c   | 224 +++--
 drivers/net/rnp/rnp_mbx_fw.c   | 112 +
 drivers/net/rnp/rnp_mbx_fw.h   | 115 +
 drivers/net/rnp/rnp_rxtx.c |  83 
 drivers/net/rnp/rnp_rxtx.h |  14 +++
 10 files changed, 706 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/rnp/rnp_rxtx.c
 create mode 100644 drivers/net/rnp/rnp_rxtx.h

diff --git a/drivers/net/rnp/base/rnp_api.c b/drivers/net/rnp/base/rnp_api.c
index 550da6217d..cf74769fb6 100644
--- a/drivers/net/rnp/base/rnp_api.c
+++ b/drivers/net/rnp/base/rnp_api.c
@@ -21,3 +21,51 @@ rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw)
return ops->reset_hw(hw);
return -EOPNOTSUPP;
 }
+
+int
+rnp_get_mac_addr(struct rte_eth_dev *dev, uint8_t *macaddr)
+{
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+
+   if (!macaddr)
+   return -EINVAL;
+   if (ops->get_mac_addr)
+   return ops->get_mac_addr(port, port->attr.nr_lane, macaddr);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_set_default_mac(struct rte_eth_dev *dev, uint8_t *mac_addr)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->set_default_mac)
+   return ops->set_default_mac(port, mac_addr);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_set_rafb(struct rte_eth_dev *dev, uint8_t *addr,
+uint8_t vm_pool, uint8_t index)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->set_rafb)
+   return ops->set_rafb(port, addr, vm_pool, index);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_clear_rafb(struct rte_eth_dev *dev,
+  uint8_t vm_pool, uint8_t index)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->clear_rafb)
+   return ops->clear_rafb(port, vm_pool, index);
+   return -EOPNOTSUPP;
+}
diff --git a/drivers/net/rnp/base/rnp_api.h b/drivers/net/rnp/base/rnp_api.h
index df574dab77..b998b11237 100644
--- a/drivers/net/rnp/base/rnp_api.h
+++ b/drivers/net/rnp/base/rnp_api.h
@@ -4,4 +4,14 @@ int
 rnp_init_hw(struct rte_eth_dev *dev);
 int
 rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw);
+int
+rnp_get_mac_addr(struct rte_eth_dev *dev, uint8_t *macaddr);
+int
+rnp_set_default_mac(struct rte_eth_dev *dev, uint8_t *mac_addr);
+int
+rnp_set_rafb(struct rte_eth_dev *dev, uint8_t *addr,
+   uint8_t vm_pool, uint8_t index);
+int
+rnp_clear_rafb(struct rte_eth_dev *dev,
+   uint8_t vm_pool, uint8_t index);
 #endif /* __RNP_API_H__ */
diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 57b7dc75a0..395b9d5c71 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -44,6 +44,10 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_rd_reg((uint8_t *)((_hw)->comm_reg_base) + (_off))
 #define rnp_top_wr(_hw, _off, _val)\
rnp_wr_reg((uint8_t *)((_hw)->comm_reg_base) + (_off), (_val))
+#define RNP_MACADDR_UPDATE_LO(hw, hw_idx, val) \
+   rnp_eth_wr(hw, RNP_RAL_BASE_ADDR(hw_idx), val)
+#define RNP_MACADDR_UPDATE_HI(hw, hw_idx, val) \
+   rnp_eth_wr(hw, RNP_RAH_BASE_ADDR(hw_idx), val)
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
@@ -112,9 +116,23 @@ struct rnp_mbx_info {
rte_atomic16_t state;
 } __rte_cache_aligned;
 
+struct rnp_eth_port;
 struct rnp_mac_api {
int32_t (*init_hw)(struct rnp_hw *hw);
int32_t (*reset_hw)(struct rnp_hw *hw);
+   /* MAC Address */
+   int32_t (*get_mac_addr)(struct rnp_eth_port *port,
+   uint8_t lane,
+   uint8_t *macaddr);
+   int32_t (*set_default_mac)(struct rnp_eth_port *port, uint8_t *mac);
+   /* Receive Address Filter Table */
+   int32_t (*set_rafb)(struct rnp_eth_port *port,
+   uint8_t *mac,
+   uint8_t vm_pool,
+   uint8_t index);
+   int32_t (*clear_rafb)(struct rnp_eth_port *port,
+   uint8_t vm_pool,
+   uint8_t index);
 };
 
 struct rnp_mac_info {
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index c52566c357..7d63460c45 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -11,6 +11,7 @@ sources = f

[PATCH v3 7/8] net/rnp add devargs runtime parsing functions

[Wenbo Cao]

add various runtime devargs command line options
supported by this driver.

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/rnp.h|  22 +
 drivers/net/rnp/rnp_ethdev.c | 166 +++
 drivers/net/rnp/rnp_mbx_fw.c | 164 ++
 drivers/net/rnp/rnp_mbx_fw.h |  69 +++
 4 files changed, 421 insertions(+)

diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 6f216cc5ca..933cdc6007 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -107,6 +107,8 @@ struct rnp_eth_port {
struct rnp_eth_adapter *adapt;
uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
struct rnp_hw *hw;
+   uint8_t rx_func_sec; /* force set io rx_func */
+   uint8_t tx_func_sec; /* force set io tx func */
struct rte_eth_dev *eth_dev;
struct rnp_port_attr attr;
/* Recvice Mac Address Record Table */
@@ -122,6 +124,13 @@ struct rnp_share_ops {
const struct rnp_mac_api *mac_api;
 } __rte_cache_aligned;
 
+enum {
+   RNP_IO_FUNC_USE_NONE = 0,
+   RNP_IO_FUNC_USE_VEC,
+   RNP_IO_FUNC_USE_SIMPLE,
+   RNP_IO_FUNC_USE_COMMON,
+};
+
 struct rnp_eth_adapter {
enum rnp_work_mode mode;
enum rnp_resource_share_m s_mode; /* Port Resource Share Policy */
@@ -135,6 +144,19 @@ struct rnp_eth_adapter {
int max_link_speed;
uint8_t num_ports; /* Cur Pf Has physical Port Num */
uint8_t lane_mask;
+
+   uint8_t rx_func_sec; /* force set io rx_func */
+   uint8_t tx_func_sec; /* force set io tx func*/
+   /*fw-update*/
+   bool  do_fw_update;
+   char *fw_path;
+
+   bool loopback_en;
+   bool fw_sfp_10g_1g_auto_det;
+   int fw_force_speed_1g;
+#define FOCE_SPEED_1G_NOT_SET  (-1)
+#define FOCE_SPEED_1G_DISABLED (0)
+#define FOCE_SPEED_1G_ENABLED  (1)
 } __rte_cache_aligned;
 
 #define RNP_DEV_TO_PORT(eth_dev) \
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index ad99f99d4a..5313dae5a2 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "rnp.h"
 #include "rnp_api.h"
@@ -14,6 +15,13 @@
 #include "rnp_rxtx.h"
 #include "rnp_logs.h"
 
+#define RNP_HW_MAC_LOOPBACK_ARG  "hw_loopback"
+#define RNP_FW_UPDATE"fw_update"
+#define RNP_RX_FUNC_SELECT   "rx_func_sec"
+#define RNP_TX_FUNC_SELECT   "tx_func_sec"
+#define RNP_FW_4X10G_10G_1G_DET  "fw_4x10g_10g_1g_auto_det"
+#define RNP_FW_FORCE_SPEED_1G"fw_force_1g_speed"
+
 static int
 rnp_mac_rx_disable(struct rte_eth_dev *dev)
 {
@@ -108,6 +116,8 @@ rnp_init_port_resource(struct rnp_eth_adapter *adapter,
struct rnp_hw *hw = &adapter->hw;
 
port->adapt = adapter;
+   port->rx_func_sec = adapter->rx_func_sec;
+   port->tx_func_sec = adapter->tx_func_sec;
port->s_mode = adapter->s_mode;
port->port_stopped = 1;
port->hw = hw;
@@ -443,6 +453,154 @@ rnp_special_ops_init(struct rte_eth_dev *eth_dev)
return 0;
 }
 
+static const char *const rnp_valid_arguments[] = {
+   RNP_HW_MAC_LOOPBACK_ARG,
+   RNP_FW_UPDATE,
+   RNP_RX_FUNC_SELECT,
+   RNP_TX_FUNC_SELECT,
+   RNP_FW_4X10G_10G_1G_DET,
+   RNP_FW_FORCE_SPEED_1G,
+   NULL
+};
+
+static int
+rnp_parse_handle_devarg(const char *key, const char *value,
+   void *extra_args)
+{
+   struct rnp_eth_adapter *adapter = NULL;
+
+   if (value == NULL || extra_args == NULL)
+   return -EINVAL;
+
+   if (strcmp(key, RNP_HW_MAC_LOOPBACK_ARG) == 0) {
+   uint64_t *n = extra_args;
+   *n = (uint16_t)strtoul(value, NULL, 10);
+   if (*n > UINT16_MAX && errno == ERANGE) {
+   RNP_PMD_DRV_LOG(ERR, "invalid extra param value\n");
+   return -1;
+   }
+   } else if (strcmp(key, RNP_FW_UPDATE) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   adapter->do_fw_update = true;
+   adapter->fw_path = strdup(value);
+   } else if (strcmp(key, RNP_FW_4X10G_10G_1G_DET) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   if (adapter->num_ports == 2 && adapter->hw.speed == 10 * 1000) {
+   adapter->fw_sfp_10g_1g_auto_det =
+   (strcmp(value, "on") == 0) ? true : false;
+   } else {
+   adapter->fw_sfp_10g_1g_auto_det = false;
+   }
+   } else if (strcmp(key, RNP_FW_FORCE_SPEED_1G) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   if (adapter->num_ports == 2) {
+   if (strcmp(value, "on") == 0)
+   adapter->fw_force_speed_1g = 
FOCE_SPEED_1G_ENABLED;
+   else if (strcmp(value, "off") == 0)
+

[PATCH v3 4/8] net/rnp: add mbx basic api feature

[Wenbo Cao]

mbx base code is for communicate with the firmware

Signed-off-by: Wenbo Cao 
Suggested-by: Stephen Hemminger 
---
 drivers/net/rnp/base/rnp_api.c  |  23 ++
 drivers/net/rnp/base/rnp_api.h  |   7 +
 drivers/net/rnp/base/rnp_cfg.h  |   7 +
 drivers/net/rnp/base/rnp_dma_regs.h |  73 
 drivers/net/rnp/base/rnp_eth_regs.h | 124 +++
 drivers/net/rnp/base/rnp_hw.h   | 112 +-
 drivers/net/rnp/meson.build |   1 +
 drivers/net/rnp/rnp.h   |  35 ++
 drivers/net/rnp/rnp_ethdev.c|  70 +++-
 drivers/net/rnp/rnp_logs.h  |   9 +
 drivers/net/rnp/rnp_mbx.c   | 524 
 drivers/net/rnp/rnp_mbx.h   | 139 
 drivers/net/rnp/rnp_mbx_fw.c| 272 +++
 drivers/net/rnp/rnp_mbx_fw.h|  22 ++
 14 files changed, 1415 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_api.c
 create mode 100644 drivers/net/rnp/base/rnp_api.h
 create mode 100644 drivers/net/rnp/base/rnp_cfg.h
 create mode 100644 drivers/net/rnp/base/rnp_dma_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_eth_regs.h
 create mode 100644 drivers/net/rnp/rnp_mbx.c
 create mode 100644 drivers/net/rnp/rnp_mbx.h
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.c
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.h

diff --git a/drivers/net/rnp/base/rnp_api.c b/drivers/net/rnp/base/rnp_api.c
new file mode 100644
index 00..550da6217d
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_api.c
@@ -0,0 +1,23 @@
+#include "rnp.h"
+#include "rnp_api.h"
+
+int
+rnp_init_hw(struct rte_eth_dev *dev)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_hw *hw = RNP_DEV_TO_HW(dev);
+
+   if (ops->init_hw)
+   return ops->init_hw(hw);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+
+   if (ops->reset_hw)
+   return ops->reset_hw(hw);
+   return -EOPNOTSUPP;
+}
diff --git a/drivers/net/rnp/base/rnp_api.h b/drivers/net/rnp/base/rnp_api.h
new file mode 100644
index 00..df574dab77
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_api.h
@@ -0,0 +1,7 @@
+#ifndef __RNP_API_H__
+#define __RNP_API_H__
+int
+rnp_init_hw(struct rte_eth_dev *dev);
+int
+rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw);
+#endif /* __RNP_API_H__ */
diff --git a/drivers/net/rnp/base/rnp_cfg.h b/drivers/net/rnp/base/rnp_cfg.h
new file mode 100644
index 00..90f25268ad
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_cfg.h
@@ -0,0 +1,7 @@
+#ifndef __RNP_CFG_H__
+#define __RNP_CFG_H__
+#include "rnp_osdep.h"
+
+#define RNP_NIC_RESET  _NIC_(0x0010)
+#define RNP_TX_QINQ_WORKAROUND _NIC_(0x801c)
+#endif /* __RNP_CFG_H__ */
diff --git a/drivers/net/rnp/base/rnp_dma_regs.h 
b/drivers/net/rnp/base/rnp_dma_regs.h
new file mode 100644
index 00..bfe87e534d
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_dma_regs.h
@@ -0,0 +1,73 @@
+#ifndef __RNP_REGS_H__
+#define __RNP_REGS_H__
+
+#include "rnp_osdep.h"
+
+/* mac address offset */
+#define RNP_DMA_CTRL   (0x4)
+#define RNP_VEB_BYPASS_EN  BIT(4)
+#define RNP_DMA_MEM_CFG_LE (0 << 5)
+#define TSNR10_DMA_MEM_CFG_BE  (1 << 5)
+#define RNP_DMA_SCATTER_MEM_SHIFT  (16)
+
+#define RNP_FIRMWARE_SYNC  (0xc)
+#define RNP_FIRMWARE_SYNC_MASK GENMASK(31, 16)
+#define RNP_FIRMWARE_SYNC_MAGIC(0xa5a4)
+#define RNP_DRIVER_REMOVE  (0x5a00)
+/* 1BIT <-> 16 bytes Dma Addr Size*/
+#define RNP_DMA_SCATTER_MEM_MASK   GENMASK(31, 16)
+#define RNP_DMA_TX_MAP_MODE_SHIFT  (12)
+#define RNP_DMA_TX_MAP_MODE_MASK   GENMASK(15, 12)
+#define RNP_DMA_RX_MEM_PAD_EN  BIT(8)
+/* === queue register = */
+/* enable */
+#define RNP_DMA_RXQ_START(qid) _RING_(0x0010 + 0x100 * (qid))
+#define RNP_DMA_RXQ_READY(qid) _RING_(0x0014 + 0x100 * (qid))
+#define RNP_DMA_TXQ_START(qid) _RING_(0x0018 + 0x100 * (qid))
+#define RNP_DMA_TXQ_READY(qid) _RING_(0x001c + 0x100 * (qid))
+
+#define RNP_DMA_INT_STAT(qid)  _RING_(0x0020 + 0x100 * (qid))
+#define RNP_DMA_INT_MASK(qid)  _RING_(0x0024 + 0x100 * (qid))
+#define RNP_TX_INT_MASKBIT(1)
+#define RNP_RX_INT_MASKBIT(0)
+#define RNP_DMA_INT_CLER(qid)  _RING_(0x0028 + 0x100 * (qid))
+
+/* rx-queue */
+#define RNP_DMA_RXQ_BASE_ADDR_HI(qid)  _RING_(0x0030 + 0x100 * (qid))
+#define RNP_DMA_RXQ_BASE_ADDR_LO(qid)  _RING_(0x0034 + 0x100 * (qid))
+#define RNP_DMA_RXQ_LEN(qid)   _RING_(0x0038 + 0x100 * (qid))
+#define RNP_DMA_RXQ_HEAD(qid)  _RING_(0x003c + 0x100 * (qid))
+#define 

[PATCH v3 3/8] net/rnp: add device init and uninit

[Wenbo Cao]

Add basic init and uninit function

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h |  19 
 drivers/net/rnp/meson.build   |   1 +
 drivers/net/rnp/rnp.h |  25 +
 drivers/net/rnp/rnp_ethdev.c  | 196 +-
 drivers/net/rnp/rnp_logs.h|  34 ++
 drivers/net/rnp/rnp_osdep.h   |  30 ++
 6 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_hw.h
 create mode 100644 drivers/net/rnp/rnp_logs.h
 create mode 100644 drivers/net/rnp/rnp_osdep.h

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
new file mode 100644
index 00..d80d23f4b4
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Mucse IC Design Ltd.
+ */
+#ifndef __RNP_HW_H__
+#define __RNP_HW_H__
+
+struct rnp_eth_adapter;
+struct rnp_hw {
+   struct rnp_eth_adapter *back;
+   void *iobar0;
+   uint32_t iobar0_len;
+   void *iobar4;
+   uint32_t iobar4_len;
+
+   uint16_t device_id;
+   uint16_t vendor_id;
+} __rte_cache_aligned;
+
+#endif /* __RNP_H__*/
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index 0c38d39347..36a1f7148d 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -10,3 +10,4 @@ endif
 sources = files(
'rnp_ethdev.c',
 )
+includes += include_directories('base')
diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 76d281cc0a..c7959c64aa 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -4,10 +4,35 @@
 #ifndef __RNP_H__
 #define __RNP_H__
 
+#include "base/rnp_hw.h"
+
 #define PCI_VENDOR_ID_MUCSE(0x8848)
 #define RNP_DEV_ID_N10G(0x1000)
+#define RNP_MAX_PORT_OF_PF (4)
+#define RNP_CFG_BAR(4)
+#define RNP_PF_INFO_BAR(0)
 
 struct rnp_eth_port {
+   struct rnp_eth_adapter *adapt;
+   struct rte_eth_dev *eth_dev;
+} __rte_cache_aligned;
+
+struct rnp_share_ops {
 } __rte_cache_aligned;
 
+struct rnp_eth_adapter {
+   struct rnp_hw hw;
+   struct rte_pci_device *pdev;
+   struct rte_eth_dev *eth_dev; /* master eth_dev */
+   struct rnp_eth_port *ports[RNP_MAX_PORT_OF_PF];
+   struct rnp_share_ops *share_priv;
+
+   uint8_t num_ports; /* Cur Pf Has physical Port Num */
+} __rte_cache_aligned;
+
+#define RNP_DEV_TO_PORT(eth_dev) \
+   (((struct rnp_eth_port *)((eth_dev)->data->dev_private)))
+#define RNP_DEV_TO_ADAPTER(eth_dev) \
+   ((struct rnp_eth_adapter *)(RNP_DEV_TO_PORT(eth_dev)->adapt))
+
 #endif /* __RNP_H__ */
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 390f2e7743..357375ee39 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -5,23 +5,198 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "rnp.h"
+#include "rnp_logs.h"
 
 static int
-rnp_eth_dev_init(struct rte_eth_dev *eth_dev)
+rnp_mac_rx_disable(struct rte_eth_dev *dev)
 {
-   RTE_SET_USED(eth_dev);
+   RTE_SET_USED(dev);
 
-   return -ENODEV;
+   return 0;
+}
+
+static int
+rnp_mac_tx_disable(struct rte_eth_dev *dev)
+{
+   RTE_SET_USED(dev);
+
+   return 0;
+}
+
+static int rnp_dev_close(struct rte_eth_dev *dev)
+{
+   RTE_SET_USED(dev);
+
+   return 0;
+}
+
+/* Features supported by this driver */
+static const struct eth_dev_ops rnp_eth_dev_ops = {
+};
+
+static int
+rnp_init_port_resource(struct rnp_eth_adapter *adapter,
+  struct rte_eth_dev *dev,
+  char *name,
+  uint8_t p_id)
+{
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   port->eth_dev = dev;
+   adapter->ports[p_id] = port;
+   dev->dev_ops = &rnp_eth_dev_ops;
+   RTE_SET_USED(name);
+
+   return 0;
+}
+
+static struct rte_eth_dev *
+rnp_alloc_eth_port(struct rte_pci_device *master_pci, char *name)
+{
+   struct rnp_eth_port *port;
+   struct rte_eth_dev *eth_dev;
+
+   eth_dev = rte_eth_dev_allocate(name);
+   if (!eth_dev) {
+   RNP_PMD_DRV_LOG(ERR, "Could not allocate "
+   "eth_dev for %s\n", name);
+   return NULL;
+   }
+   port = rte_zmalloc_socket(name,
+   sizeof(*port),
+   RTE_CACHE_LINE_SIZE,
+   master_pci->device.numa_node);
+   if (!port) {
+   RNP_PMD_DRV_LOG(ERR, "Could not allocate "
+   "rnp_eth_port for %s\n", name);
+   return NULL;
+   }
+   eth_dev->data->dev_private = port;
+   eth_dev->process_private = calloc(1, sizeof(struct rnp_share_ops));
+   if (!eth_dev->process_private) {
+   RNP_PMD_DRV_LOG(ERR, "Could not calloc "
+   "for Process_priv\n");
+   goto fail_calloc;
+   }
+   return eth_dev;
+fail_calloc:
+ 

[PATCH v3 8/8] net/rnp handle device interrupts

[Wenbo Cao]

Handle device lsc interrupt event

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h   |   5 +
 drivers/net/rnp/base/rnp_mac_regs.h | 279 
 drivers/net/rnp/rnp.h   |   8 +
 drivers/net/rnp/rnp_ethdev.c|  17 ++
 drivers/net/rnp/rnp_mbx.h   |   3 +-
 drivers/net/rnp/rnp_mbx_fw.c| 233 +++
 drivers/net/rnp/rnp_mbx_fw.h|  38 +++-
 7 files changed, 580 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_mac_regs.h

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 395b9d5c71..5c50484c6c 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -10,6 +10,7 @@
 #include "rnp_osdep.h"
 #include "rnp_dma_regs.h"
 #include "rnp_eth_regs.h"
+#include "rnp_mac_regs.h"
 #include "rnp_cfg.h"
 
 static inline unsigned int rnp_rd_reg(volatile void *addr)
@@ -48,6 +49,10 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_eth_wr(hw, RNP_RAL_BASE_ADDR(hw_idx), val)
 #define RNP_MACADDR_UPDATE_HI(hw, hw_idx, val) \
rnp_eth_wr(hw, RNP_RAH_BASE_ADDR(hw_idx), val)
+#define rnp_mac_rd(hw, id, off) \
+   rnp_rd_reg((char *)(hw)->mac_base[id] + (off))
+#define rnp_mac_wr(hw, id, off, val) \
+   rnp_wr_reg((char *)(hw)->mac_base[id] + (off), val)
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
diff --git a/drivers/net/rnp/base/rnp_mac_regs.h 
b/drivers/net/rnp/base/rnp_mac_regs.h
new file mode 100644
index 00..f9466b3841
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_mac_regs.h
@@ -0,0 +1,279 @@
+#ifndef __RNP_MAC_REGS_H__
+#define __RNP_MAC_REGS_H__
+
+#include "rnp_osdep.h"
+#define RNP_MAC_TX_CFG (0x0)
+
+/* Transmitter Enable */
+#define RNP_MAC_TE BIT(0)
+/* Jabber Disable */
+#define RNP_MAC_JD BIT(16)
+#define RNP_SPEED_SEL_1G   (BIT(30) | BIT(29) | BIT(28))
+#define RNP_SPEED_SEL_10G  BIT(30)
+#define RNP_SPEED_SEL_40G  (0)
+#define RNP_MAC_RX_CFG (0x4)
+/* Receiver Enable */
+#define RNP_MAC_RE BIT(0)
+/* Automatic Pad or CRC Stripping */
+#define RNP_MAC_ACSBIT(1)
+/* CRC stripping for Type packets */
+#define RNP_MAC_CSTBIT(2)
+/* Disable CRC Check */
+#define RNP_MAC_DCRCC  BIT(3)
+/* Enable Max Frame Size Limit */
+#define RNP_MAC_GPSLCE BIT(6)
+/* Watchdog Disable */
+#define RNP_MAC_WD BIT(7)
+/* Jumbo Packet Support En */
+#define RNP_MAC_JE BIT(8)
+/* Loopback Mode */
+#define RNP_MAC_LM BIT(10)
+/* Giant Packet Size Limit */
+#define RNP_MAC_GPSL_MASK  GENMASK(29, 16)
+#define RNP_MAC_MAX_GPSL   (1518)
+#define RNP_MAC_CPSL_SHIFT (16)
+
+#define RNP_MAC_PKT_FLT_CTRL   (0x8)
+
+/* Receive All */
+#define RNP_MAC_RA BIT(31)
+/* Pass Control Packets */
+#define RNP_MAC_PCFGENMASK(7, 6)
+#define RNP_MAC_PCF_OFFSET (6)
+/* Mac Filter ALL Ctrl Frame */
+#define RNP_MAC_PCF_FAC(0)
+/* Mac Forward ALL Ctrl Frame Except Pause */
+#define RNP_MAC_PCF_NO_PAUSE   (1)
+/* Mac Forward All Ctrl Pkt */
+#define RNP_MAC_PCF_PA (2)
+/* Mac Forward Ctrl Frame Match Unicast */
+#define RNP_MAC_PCF_PUN(3)
+/* Promiscuous Mode */
+#define RNP_MAC_PROMISC_EN BIT(0)
+/* Hash Unicast */
+#define RNP_MAC_HUCBIT(1)
+/* Hash Multicast */
+#define RNP_MAC_HMCBIT(2)
+/*  Pass All Multicast */
+#define RNP_MAC_PM BIT(4)
+/* Disable Broadcast Packets */
+#define RNP_MAC_DBFBIT(5)
+/* Hash or Perfect Filter */
+#define RNP_MAC_HPFBIT(10)
+#define RNP_MAC_VTFE   BIT(16)
+/* Interrupt Status */
+#define RNP_MAC_INT_STATUS _MAC_(0xb0)
+#define RNP_MAC_LS_MASKGENMASK(25, 24)
+#define RNP_MAC_LS_UP  (0)
+#define RNP_MAC_LS_LOCAL_FAULT BIT(25)
+#define RNP_MAC_LS_REMOTE_FAULT(BIT(25) | BIT(24))
+/* Unicast Mac Hash Table */
+#define RNP_MAC_UC_HASH_TB(n)  _MAC_(0x10 + ((n) * 0x4))
+
+
+#define RNP_MAC_LPI_CTRL   (0xd0)
+
+/* PHY Link Status Disable */
+#define RNP_MAC_PLSDIS BIT(18)
+/* PHY Link Status */
+#define RNP_MAC_PLSBIT(17)
+
+/* MAC VLAN CTRL Strip REG */
+#define RNP_MAC_VLAN_TAG   (0x50)
+
+/* En Inner VLAN Strip Action */
+#define RNP_MAC_EIVLS  GENMASK(29, 28)
+/* Inner VLAN Strip Action Shift */
+#define RNP_MAC_IV_EIVLS_SHIFT (28)
+/* Inner Vlan Don't Strip*/
+#define RNP_MAC_IV_STRIP_NONE  (0x0)
+/* Inner Vlan Strip When Filter Match Success */
+#define RNP_MAC_IV_STRIP_PASS  (0x1)
+/* I

Re: [PATCH v1] event/dlb2: add support for disabling PASID

[David Marchand]

On Thu, Jun 8, 2023 at 9:28 AM David Marchand  wrote:
>
> On Thu, Jun 8, 2023 at 7:38 AM Jerin Jacob  wrote:
> >
> > On Thu, Jun 8, 2023 at 2:31 AM Abdullah Sevincer
> >  wrote:
> > >
> > > vfio-pci driver in Linux kernel 6.2 enables PASID by default.
> > > In DLB hardware, enabling PASID puts DLB in SIOV mode. This
> > > breaks DLB PF-PMD mode. For DLB PF-PMD mode to function properly
> > > PASID needs to be disabled for kernel 6.2.
> > >
> > > In this commit this issue is addressed and PASID is disabled
> > > by writing a zero to PASID control register.
> > >
> > > Signed-off-by: Abdullah Sevincer 
> >
> > > +   /* The current Linux kernel vfio driver does not expose PASID 
> > > capability to
> > > +* users. It also enables PASID by default, which breaks DLB PF 
> > > PMD. We have
> > > +* to use the hardcoded offset for now to disable PASID.
> > > +*/
> > > +   pasid_cap_offset = DLB2_PCI_PASID_CAP_OFFSET;
> > > +
> > > +   off = pasid_cap_offset + DLB2_PCI_PASID_CTRL;
> >
> > +++ additional folks.
> >
> > Is make sense to move this helper function to PCI common for disabling
> > PASID for a PCI device so that other driver can use if needed
> > as the implementation is not specific to DLB2.
>
> Yes, having a helper sounds like a first step (and we probably have
> more helpers to add seeing how drivers tend to redefine non vendor
> specific pci configs, but that's another story).

About this other story, I sent a cleanup series:
https://patchwork.dpdk.org/project/dpdk/list/?series=29101&state=%2A&archive=both

Comments/reviews welcome.


>
> Now, about PASID being enabled by default with Linux 6.2, is this
> breaking of dlb PF something special? Or can we expect many (all?)
> other devices to break too?
> If so, maybe we should disable it in the pci common code.

Is anybody looking into reworking this proposal and moving this code
to the pci bus driver?
Cc: pci bus maintainers.


-- 
David Marchand

Re: error: No probed ethernet devices

[Bruce Richardson]

On Wed, Aug 02, 2023 at 01:29:03PM +, FRANCISCO ARNALDO BOIX MARTINEZ wrote:
>Hi team,
> 
>I am trying to run dpdk-testpmd utility, but I am not able to make it
>work even though I have already used dpdk-devbind.py utility. I haven't
>been able to find the solution yet, could you please help me?
> 
>I get the following output while executing ./usertools/dpdk-devbind.py
>-s:
> 
>Network devices using kernel driver
>===
>:04:00.0 'RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller
>8168' if=enp4s0 drv=r8169 unused=vfio-pci *Active*

This indicates that you have only a single network card port, which is
bound to the kernel for kernel use. It's also a device which I don't
believe we have drivers for in DPDK - so even if you did unbind it (and
lose network connectivity to your board - it still likely wouldn't be
usable with DPDK.

I therefore think you need to add some supported network devices to your
system to use DPDK. You generally need to keep one network port for kernel
use and use DPDK on the rest. The only exception is if you plan on using
DPDK through af_xdp or af_packet or similar driver that takes packets from
a kernel-connected port.

Regards,
/Bruce

Re: [RFC PATCH 0/1] make cmdline library easier to use

[Bruce Richardson]

On Wed, Aug 02, 2023 at 11:05:07AM -0700, Stephen Hemminger wrote:
> On Wed,  2 Aug 2023 18:00:51 +0100
> Bruce Richardson  wrote:
> 
> > And now for something completely different... :-)
> > 
> > While it's nice that DPDK includes a commandline library for easily
> > adding interactivity to applications, the library itself is a little
> > clunky to use, due to the massive amounts of boilerplate definitions
> > required. Having used it recently on an app I was playing with for
> > testing, I decided the situation can potentially be improved with it
> > by use of a script to produce the boilerplate when given a simple
> > list of commands the user wants to add to the app.
> > 
> > This is the result of that effort. Sending it here as a rough-draft to
> > get feedback on whether this is worth including in DPDK itself.
> > Hopefully others may find it of use.
> > 
> > Bruce Richardson (1):
> >   cmdline/dpdk-cmdline-gen: generate boilerplate for simple cmds
> > 
> >  lib/cmdline/dpdk-cmdline-gen.py | 143 
> >  1 file changed, 143 insertions(+)
> >  create mode 100755 lib/cmdline/dpdk-cmdline-gen.py
> 
> Ok, but this surely is a solved problem is some other open source library.
> Or does every project reinvent this parsing?
> 
> Seems to me that something like bison/flex (ie yacc/lex) would be better
> in terms of expressing the syntax separate from the implementation.

Sure, but it has been many, many years since I last even looked at those
tools, so it was faster for me to just use this python script for quick
cmdline generation when prototyping things! :-) I wanted something that
worked for me, so I'm just sharing it with the community in case others
find it useful.

If you have time, please do indeed come up with a lex/yacc generator
instead, it would indeed be a better solution. [If not, I suggest we take
what we can get if it works! :-)]

/Bruce

[PATCH v4 0/8] [v4] drivers/net Add Support mucse N10 Pmd Driver

[Wenbo Cao]

For This patchset just to support the basic chip init work
and user can just found the eth_dev, but can't control more.
For Now just support 2*10g nic,the chip can support
2*10g,4*10g,4*1g,8*1g,8*10g.
The Feature rx side can support rx-cksum-offload,rss,vlan-filter
flow_clow,uncast_filter,mcast_filter,1588,Jumbo-frame
The Feature tx side can supprt tx-cksum-offload,tso,vxlan-tso 
flow director base on ntuple pattern of tcp/udp/ip/ eth_hdr->type
for sriov is also support.

Because of the chip desgin defect, for multiple-port mode
one pci-bdf will have multiple-port (max can have four ports)
so this code must be care of one bdf init multiple-port.

v4:
  * one patch has been forget to upload :(

v3:
  * fixed http://dpdk.org/patch/129830 FreeBSD 13 compile Issue
  * change iobar type to void suggest by Stephen Hemminger
  * add KMOD_DEP support for vfio-pci
  * change run-cmd argument parse check for invalid extra_args

v2:
  * fixed MAINTAIN maillist fullname format
  * fixed driver/net/meson the order issue of new driver to driver list
  * improve virtual point function usage suggest by Stephen Hemminger


Wenbo Cao (8):
  net/rnp: add skeleton
  net/rnp: add ethdev probe and remove
  net/rnp: add device init and uninit
  net/rnp: add mbx basic api feature
  net/rnp add reset code for Chip Init process
  net/rnp add port info resource init
  net/rnp add devargs runtime parsing functions
  net/rnp handle device interrupts

 MAINTAINERS |   6 +
 doc/guides/nics/features/rnp.ini|   8 +
 doc/guides/nics/index.rst   |   1 +
 doc/guides/nics/rnp.rst |  43 ++
 drivers/net/meson.build |   1 +
 drivers/net/rnp/base/rnp_api.c  |  71 +++
 drivers/net/rnp/base/rnp_api.h  |  17 +
 drivers/net/rnp/base/rnp_cfg.h  |   7 +
 drivers/net/rnp/base/rnp_dma_regs.h |  73 +++
 drivers/net/rnp/base/rnp_eth_regs.h | 124 +
 drivers/net/rnp/base/rnp_hw.h   | 206 +++
 drivers/net/rnp/base/rnp_mac_regs.h | 279 ++
 drivers/net/rnp/meson.build |  18 +
 drivers/net/rnp/rnp.h   | 218 
 drivers/net/rnp/rnp_ethdev.c| 822 
 drivers/net/rnp/rnp_logs.h  |  43 ++
 drivers/net/rnp/rnp_mbx.c   | 524 ++
 drivers/net/rnp/rnp_mbx.h   | 140 +
 drivers/net/rnp/rnp_mbx_fw.c| 781 ++
 drivers/net/rnp/rnp_mbx_fw.h| 401 ++
 drivers/net/rnp/rnp_osdep.h |  30 +
 drivers/net/rnp/rnp_rxtx.c  |  83 +++
 drivers/net/rnp/rnp_rxtx.h  |  14 +
 23 files changed, 3910 insertions(+)
 create mode 100644 doc/guides/nics/features/rnp.ini
 create mode 100644 doc/guides/nics/rnp.rst
 create mode 100644 drivers/net/rnp/base/rnp_api.c
 create mode 100644 drivers/net/rnp/base/rnp_api.h
 create mode 100644 drivers/net/rnp/base/rnp_cfg.h
 create mode 100644 drivers/net/rnp/base/rnp_dma_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_eth_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_hw.h
 create mode 100644 drivers/net/rnp/base/rnp_mac_regs.h
 create mode 100644 drivers/net/rnp/meson.build
 create mode 100644 drivers/net/rnp/rnp.h
 create mode 100644 drivers/net/rnp/rnp_ethdev.c
 create mode 100644 drivers/net/rnp/rnp_logs.h
 create mode 100644 drivers/net/rnp/rnp_mbx.c
 create mode 100644 drivers/net/rnp/rnp_mbx.h
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.c
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.h
 create mode 100644 drivers/net/rnp/rnp_osdep.h
 create mode 100644 drivers/net/rnp/rnp_rxtx.c
 create mode 100644 drivers/net/rnp/rnp_rxtx.h

-- 
2.27.0

[PATCH v4 1/8] net/rnp: add skeleton

[Wenbo Cao]

Add Basic PMD library and doc build infrastructure
Update maintainers file to claim responsibility.

Signed-off-by: Wenbo Cao 
---
 MAINTAINERS  |  6 +
 doc/guides/nics/features/rnp.ini |  8 ++
 doc/guides/nics/index.rst|  1 +
 doc/guides/nics/rnp.rst  | 43 
 drivers/net/meson.build  |  1 +
 drivers/net/rnp/meson.build  | 12 +
 drivers/net/rnp/rnp_ethdev.c |  3 +++
 7 files changed, 74 insertions(+)
 create mode 100644 doc/guides/nics/features/rnp.ini
 create mode 100644 doc/guides/nics/rnp.rst
 create mode 100644 drivers/net/rnp/meson.build
 create mode 100644 drivers/net/rnp/rnp_ethdev.c

diff --git a/MAINTAINERS b/MAINTAINERS
index a5219926ab..29c130b280 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -955,6 +955,12 @@ F: drivers/net/qede/
 F: doc/guides/nics/qede.rst
 F: doc/guides/nics/features/qede*.ini
 
+Mucse rnp
+M: Wenbo Cao 
+F: drivers/net/rnp
+F: doc/guides/nics/rnp.rst
+F: doc/guides/nics/features/rnp.ini
+
 Solarflare sfc_efx
 M: Andrew Rybchenko 
 F: drivers/common/sfc_efx/
diff --git a/doc/guides/nics/features/rnp.ini b/doc/guides/nics/features/rnp.ini
new file mode 100644
index 00..2ad04ee330
--- /dev/null
+++ b/doc/guides/nics/features/rnp.ini
@@ -0,0 +1,8 @@
+;
+; Supported features of the 'rnp' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+x86-64   = Y
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index 5c9d1edf5e..cc89d3154a 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -61,6 +61,7 @@ Network Interface Controller Drivers
 pcap_ring
 pfe
 qede
+rnp
 sfc_efx
 softnic
 tap
diff --git a/doc/guides/nics/rnp.rst b/doc/guides/nics/rnp.rst
new file mode 100644
index 00..5b3a3d0483
--- /dev/null
+++ b/doc/guides/nics/rnp.rst
@@ -0,0 +1,43 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2023 Mucse IC Design Ltd.
+
+RNP Poll Mode driver
+==
+
+The RNP ETHDEV PMD (**librte_net_rnp**) provides poll mode ethdev
+driver support for the inbuilt network device found in the **Mucse RNP**
+
+Prerequisites
+-
+More information can be found at `Mucse, Official Website
+`_.
+
+Supported RNP SoCs
+
+
+- N10
+
+Driver compilation and testing
+--
+
+Refer to the document :ref:`compiling and testing a PMD for a NIC 
`
+for details.
+
+#. Running testpmd:
+
+   Follow instructions available in the document
+   :ref:`compiling and testing a PMD for a NIC `
+   to run testpmd.
+
+Limitations or Known issues
+
+Build with ICC is not supported yet.
+CRC stripping
+~~
+The RNP SoC family NICs strip the CRC for every packets coming into the
+host interface irrespective of the offload configuration.
+When You Want To Disable CRC_OFFLOAD The Feature Will Influence The RxCksum 
Offload
+VLAN Strip
+~~~
+For VLAN Strip RNP Just Support CVLAN(0x8100) Type If The Vlan Type Is 
SVLAN(0X88a8)
+VLAN Filter Or Strip Will Not Effert For This Packet It Will Bypass To The 
Host.
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index b1df17ce8c..f9e013d38e 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -54,6 +54,7 @@ drivers = [
 'pfe',
 'qede',
 'ring',
+'rnp',
 'sfc',
 'softnic',
 'tap',
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
new file mode 100644
index 00..0c38d39347
--- /dev/null
+++ b/drivers/net/rnp/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(C) 2023 Mucse IC Design Ltd.
+#
+if is_windows
+build = false
+reason = 'not supported on Windows'
+subdir_done()
+endif
+
+sources = files(
+   'rnp_ethdev.c',
+)
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
new file mode 100644
index 00..9ce3c0b497
--- /dev/null
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Mucse IC Design Ltd.
+ */
-- 
2.27.0

[PATCH v4 2/8] net/rnp: add ethdev probe and remove

[Wenbo Cao]

Add basic PCIe ethdev probe and remove.

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/rnp.h| 13 ++
 drivers/net/rnp/rnp_ethdev.c | 83 
 2 files changed, 96 insertions(+)
 create mode 100644 drivers/net/rnp/rnp.h

diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
new file mode 100644
index 00..76d281cc0a
--- /dev/null
+++ b/drivers/net/rnp/rnp.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Mucse IC Design Ltd.
+ */
+#ifndef __RNP_H__
+#define __RNP_H__
+
+#define PCI_VENDOR_ID_MUCSE(0x8848)
+#define RNP_DEV_ID_N10G(0x1000)
+
+struct rnp_eth_port {
+} __rte_cache_aligned;
+
+#endif /* __RNP_H__ */
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 9ce3c0b497..390f2e7743 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -1,3 +1,86 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(C) 2023 Mucse IC Design Ltd.
  */
+
+#include 
+#include 
+#include 
+
+#include "rnp.h"
+
+static int
+rnp_eth_dev_init(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+
+   return -ENODEV;
+}
+
+static int
+rnp_eth_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+
+   return -ENODEV;
+}
+
+static int
+rnp_pci_remove(struct rte_pci_device *pci_dev)
+{
+   struct rte_eth_dev *eth_dev;
+   int rc;
+
+   eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+
+   if (eth_dev) {
+   /* Cleanup eth dev */
+   rc = rte_eth_dev_pci_generic_remove(pci_dev,
+   rnp_eth_dev_uninit);
+   if (rc)
+   return rc;
+   }
+   /* Nothing to be done for secondary processes */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return 0;
+
+   return 0;
+}
+
+static int
+rnp_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+   int rc;
+
+   RTE_SET_USED(pci_drv);
+
+   rc = rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct rnp_eth_port),
+  rnp_eth_dev_init);
+
+   /* On error on secondary, recheck if port exists in primary or
+* in mid of detach state.
+*/
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY && rc)
+   if (!rte_eth_dev_allocated(pci_dev->device.name))
+   return 0;
+   return rc;
+}
+
+static const struct rte_pci_id pci_id_rnp_map[] = {
+   {
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_MUCSE, RNP_DEV_ID_N10G)
+   },
+   {
+   .vendor_id = 0,
+   },
+};
+
+static struct rte_pci_driver rte_rnp_pmd = {
+   .id_table = pci_id_rnp_map,
+   .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+   .probe = rnp_pci_probe,
+   .remove = rnp_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_rnp, rte_rnp_pmd);
+RTE_PMD_REGISTER_PCI_TABLE(net_rnp, pci_id_rnp_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_rnp, "igb_uio | uio_pci_generic | vfio-pci");
-- 
2.27.0

[PATCH v4 3/8] net/rnp: add device init and uninit

[Wenbo Cao]

Add basic init and uninit function

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h |  19 
 drivers/net/rnp/meson.build   |   1 +
 drivers/net/rnp/rnp.h |  25 +
 drivers/net/rnp/rnp_ethdev.c  | 196 +-
 drivers/net/rnp/rnp_logs.h|  34 ++
 drivers/net/rnp/rnp_osdep.h   |  30 ++
 6 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_hw.h
 create mode 100644 drivers/net/rnp/rnp_logs.h
 create mode 100644 drivers/net/rnp/rnp_osdep.h

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
new file mode 100644
index 00..d80d23f4b4
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Mucse IC Design Ltd.
+ */
+#ifndef __RNP_HW_H__
+#define __RNP_HW_H__
+
+struct rnp_eth_adapter;
+struct rnp_hw {
+   struct rnp_eth_adapter *back;
+   void *iobar0;
+   uint32_t iobar0_len;
+   void *iobar4;
+   uint32_t iobar4_len;
+
+   uint16_t device_id;
+   uint16_t vendor_id;
+} __rte_cache_aligned;
+
+#endif /* __RNP_H__*/
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index 0c38d39347..36a1f7148d 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -10,3 +10,4 @@ endif
 sources = files(
'rnp_ethdev.c',
 )
+includes += include_directories('base')
diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 76d281cc0a..c7959c64aa 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -4,10 +4,35 @@
 #ifndef __RNP_H__
 #define __RNP_H__
 
+#include "base/rnp_hw.h"
+
 #define PCI_VENDOR_ID_MUCSE(0x8848)
 #define RNP_DEV_ID_N10G(0x1000)
+#define RNP_MAX_PORT_OF_PF (4)
+#define RNP_CFG_BAR(4)
+#define RNP_PF_INFO_BAR(0)
 
 struct rnp_eth_port {
+   struct rnp_eth_adapter *adapt;
+   struct rte_eth_dev *eth_dev;
+} __rte_cache_aligned;
+
+struct rnp_share_ops {
 } __rte_cache_aligned;
 
+struct rnp_eth_adapter {
+   struct rnp_hw hw;
+   struct rte_pci_device *pdev;
+   struct rte_eth_dev *eth_dev; /* master eth_dev */
+   struct rnp_eth_port *ports[RNP_MAX_PORT_OF_PF];
+   struct rnp_share_ops *share_priv;
+
+   uint8_t num_ports; /* Cur Pf Has physical Port Num */
+} __rte_cache_aligned;
+
+#define RNP_DEV_TO_PORT(eth_dev) \
+   (((struct rnp_eth_port *)((eth_dev)->data->dev_private)))
+#define RNP_DEV_TO_ADAPTER(eth_dev) \
+   ((struct rnp_eth_adapter *)(RNP_DEV_TO_PORT(eth_dev)->adapt))
+
 #endif /* __RNP_H__ */
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 390f2e7743..357375ee39 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -5,23 +5,198 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "rnp.h"
+#include "rnp_logs.h"
 
 static int
-rnp_eth_dev_init(struct rte_eth_dev *eth_dev)
+rnp_mac_rx_disable(struct rte_eth_dev *dev)
 {
-   RTE_SET_USED(eth_dev);
+   RTE_SET_USED(dev);
 
-   return -ENODEV;
+   return 0;
+}
+
+static int
+rnp_mac_tx_disable(struct rte_eth_dev *dev)
+{
+   RTE_SET_USED(dev);
+
+   return 0;
+}
+
+static int rnp_dev_close(struct rte_eth_dev *dev)
+{
+   RTE_SET_USED(dev);
+
+   return 0;
+}
+
+/* Features supported by this driver */
+static const struct eth_dev_ops rnp_eth_dev_ops = {
+};
+
+static int
+rnp_init_port_resource(struct rnp_eth_adapter *adapter,
+  struct rte_eth_dev *dev,
+  char *name,
+  uint8_t p_id)
+{
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   port->eth_dev = dev;
+   adapter->ports[p_id] = port;
+   dev->dev_ops = &rnp_eth_dev_ops;
+   RTE_SET_USED(name);
+
+   return 0;
+}
+
+static struct rte_eth_dev *
+rnp_alloc_eth_port(struct rte_pci_device *master_pci, char *name)
+{
+   struct rnp_eth_port *port;
+   struct rte_eth_dev *eth_dev;
+
+   eth_dev = rte_eth_dev_allocate(name);
+   if (!eth_dev) {
+   RNP_PMD_DRV_LOG(ERR, "Could not allocate "
+   "eth_dev for %s\n", name);
+   return NULL;
+   }
+   port = rte_zmalloc_socket(name,
+   sizeof(*port),
+   RTE_CACHE_LINE_SIZE,
+   master_pci->device.numa_node);
+   if (!port) {
+   RNP_PMD_DRV_LOG(ERR, "Could not allocate "
+   "rnp_eth_port for %s\n", name);
+   return NULL;
+   }
+   eth_dev->data->dev_private = port;
+   eth_dev->process_private = calloc(1, sizeof(struct rnp_share_ops));
+   if (!eth_dev->process_private) {
+   RNP_PMD_DRV_LOG(ERR, "Could not calloc "
+   "for Process_priv\n");
+   goto fail_calloc;
+   }
+   return eth_dev;
+fail_calloc:
+ 

[PATCH v4 5/8] net/rnp add reset code for Chip Init process

[Wenbo Cao]

we must get the shape info of nic from Firmware for
reset. so the related codes is first get firmware info
and then reset the chip

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h |  56 +++-
 drivers/net/rnp/meson.build   |   3 +
 drivers/net/rnp/rnp.h |  27 ++
 drivers/net/rnp/rnp_ethdev.c  |  93 ++-
 drivers/net/rnp/rnp_mbx_fw.h  | 163 +-
 5 files changed, 339 insertions(+), 3 deletions(-)

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 1db966cf21..57b7dc75a0 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -8,6 +8,9 @@
 #include 
 
 #include "rnp_osdep.h"
+#include "rnp_dma_regs.h"
+#include "rnp_eth_regs.h"
+#include "rnp_cfg.h"
 
 static inline unsigned int rnp_rd_reg(volatile void *addr)
 {
@@ -29,7 +32,18 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_rd_reg((uint8_t *)(_base) + (_off))
 #define rnp_io_wr(_base, _off, _val)   \
rnp_wr_reg((uint8_t *)(_base) + (_off), (_val))
-
+#define rnp_eth_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->eth_base) + (_off))
+#define rnp_eth_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->eth_base) + (_off), (_val))
+#define rnp_dma_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->dma_base) + (_off))
+#define rnp_dma_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->dma_base) + (_off), (_val))
+#define rnp_top_rd(_hw, _off)  \
+   rnp_rd_reg((uint8_t *)((_hw)->comm_reg_base) + (_off))
+#define rnp_top_wr(_hw, _off, _val)\
+   rnp_wr_reg((uint8_t *)((_hw)->comm_reg_base) + (_off), (_val))
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
@@ -98,6 +112,17 @@ struct rnp_mbx_info {
rte_atomic16_t state;
 } __rte_cache_aligned;
 
+struct rnp_mac_api {
+   int32_t (*init_hw)(struct rnp_hw *hw);
+   int32_t (*reset_hw)(struct rnp_hw *hw);
+};
+
+struct rnp_mac_info {
+   uint8_t assign_addr[RTE_ETHER_ADDR_LEN];
+   uint8_t set_addr[RTE_ETHER_ADDR_LEN];
+   struct rnp_mac_api ops;
+} __rte_cache_aligned;
+
 struct rnp_eth_adapter;
 #define RNP_MAX_HW_PORT_PERR_PF (4)
 struct rnp_hw {
@@ -111,8 +136,10 @@ struct rnp_hw {
void *eth_base;
void *veb_base;
void *mac_base[RNP_MAX_HW_PORT_PERR_PF];
+   void *comm_reg_base;
void *msix_base;
/* === dma == */
+   void *dev_version;
void *dma_axi_en;
void *dma_axi_st;
 
@@ -120,10 +147,37 @@ struct rnp_hw {
uint16_t vendor_id;
uint16_t function;
uint16_t pf_vf_num;
+   int pfvfnum;
uint16_t max_vfs;
+
+   bool ncsi_en;
+   uint8_t ncsi_rar_entries;
+
+   int sgmii_phy_id;
+   int is_sgmii;
+   u16 phy_type;
+   uint8_t force_10g_1g_speed_ablity;
+   uint8_t force_speed_stat;
+#define FORCE_SPEED_STAT_DISABLED   (0)
+#define FORCE_SPEED_STAT_1G (1)
+#define FORCE_SPEED_STAT_10G(2)
+   uint32_t speed;
+   unsigned int axi_mhz;
+
+   int fw_version;  /* Primary FW Version */
+   uint32_t fw_uid; /* Subclass Fw Version */
+
+   int nic_mode;
+   unsigned char lane_mask;
+   int lane_of_port[4];
+   char phy_port_ids[4]; /* port id: for lane0~3: value: 0 ~ 7 */
+   uint8_t max_port_num; /* Max Port Num This PF Have */
+
void *cookie_pool;
char cookie_p_name[RTE_MEMZONE_NAMESIZE];
 
+   struct rnp_mac_info mac;
struct rnp_mbx_info mbx;
+   rte_spinlock_t fw_lock;
 } __rte_cache_aligned;
 #endif /* __RNP_H__*/
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index 38dbee5ca4..c52566c357 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -10,5 +10,8 @@ endif
 sources = files(
'rnp_ethdev.c',
'rnp_mbx.c',
+   'rnp_mbx_fw.c',
+   'base/rnp_api.c',
 )
+
 includes += include_directories('base')
diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 086667cec1..f6c9231eb1 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -13,6 +13,20 @@
 #define RNP_CFG_BAR(4)
 #define RNP_PF_INFO_BAR(0)
 
+enum rnp_resource_share_m {
+   RNP_SHARE_CORPORATE = 0,
+   RNP_SHARE_INDEPEND,
+};
+/*
+ * Structure to store private data for each driver instance (for each port).
+ */
+enum rnp_work_mode {
+   RNP_SINGLE_40G = 0,
+   RNP_SINGLE_10G = 1,
+   RNP_DUAL_10G = 2,
+   RNP_QUAD_10G = 3,
+};
+
 struct rnp_eth_port {
struct rnp_eth_adapter *adapt;
struct rnp_hw *hw;
@@ -21,9 +35,12 @@ struct rnp_eth_port {
 
 struct rnp_share_ops {
const struct rnp_mbx_api *mbx_api;
+   const struct rnp_mac_api *mac_api;
 } __rte_cache_aligned;
 
 struct rnp_eth_adapter {
+   enum rnp_work_mode mode;
+   enum rnp_resource_share_m s_mode; /* Port Resource Sha

[PATCH v4 4/8] net/rnp: add mbx basic api feature

[Wenbo Cao]

mbx base code is for communicate with the firmware

Signed-off-by: Wenbo Cao 
Suggested-by: Stephen Hemminger 
---
 drivers/net/rnp/base/rnp_api.c  |  23 ++
 drivers/net/rnp/base/rnp_api.h  |   7 +
 drivers/net/rnp/base/rnp_cfg.h  |   7 +
 drivers/net/rnp/base/rnp_dma_regs.h |  73 
 drivers/net/rnp/base/rnp_eth_regs.h | 124 +++
 drivers/net/rnp/base/rnp_hw.h   | 112 +-
 drivers/net/rnp/meson.build |   1 +
 drivers/net/rnp/rnp.h   |  35 ++
 drivers/net/rnp/rnp_ethdev.c|  70 +++-
 drivers/net/rnp/rnp_logs.h  |   9 +
 drivers/net/rnp/rnp_mbx.c   | 524 
 drivers/net/rnp/rnp_mbx.h   | 139 
 drivers/net/rnp/rnp_mbx_fw.c| 272 +++
 drivers/net/rnp/rnp_mbx_fw.h|  22 ++
 14 files changed, 1415 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_api.c
 create mode 100644 drivers/net/rnp/base/rnp_api.h
 create mode 100644 drivers/net/rnp/base/rnp_cfg.h
 create mode 100644 drivers/net/rnp/base/rnp_dma_regs.h
 create mode 100644 drivers/net/rnp/base/rnp_eth_regs.h
 create mode 100644 drivers/net/rnp/rnp_mbx.c
 create mode 100644 drivers/net/rnp/rnp_mbx.h
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.c
 create mode 100644 drivers/net/rnp/rnp_mbx_fw.h

diff --git a/drivers/net/rnp/base/rnp_api.c b/drivers/net/rnp/base/rnp_api.c
new file mode 100644
index 00..550da6217d
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_api.c
@@ -0,0 +1,23 @@
+#include "rnp.h"
+#include "rnp_api.h"
+
+int
+rnp_init_hw(struct rte_eth_dev *dev)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_hw *hw = RNP_DEV_TO_HW(dev);
+
+   if (ops->init_hw)
+   return ops->init_hw(hw);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+
+   if (ops->reset_hw)
+   return ops->reset_hw(hw);
+   return -EOPNOTSUPP;
+}
diff --git a/drivers/net/rnp/base/rnp_api.h b/drivers/net/rnp/base/rnp_api.h
new file mode 100644
index 00..df574dab77
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_api.h
@@ -0,0 +1,7 @@
+#ifndef __RNP_API_H__
+#define __RNP_API_H__
+int
+rnp_init_hw(struct rte_eth_dev *dev);
+int
+rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw);
+#endif /* __RNP_API_H__ */
diff --git a/drivers/net/rnp/base/rnp_cfg.h b/drivers/net/rnp/base/rnp_cfg.h
new file mode 100644
index 00..90f25268ad
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_cfg.h
@@ -0,0 +1,7 @@
+#ifndef __RNP_CFG_H__
+#define __RNP_CFG_H__
+#include "rnp_osdep.h"
+
+#define RNP_NIC_RESET  _NIC_(0x0010)
+#define RNP_TX_QINQ_WORKAROUND _NIC_(0x801c)
+#endif /* __RNP_CFG_H__ */
diff --git a/drivers/net/rnp/base/rnp_dma_regs.h 
b/drivers/net/rnp/base/rnp_dma_regs.h
new file mode 100644
index 00..bfe87e534d
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_dma_regs.h
@@ -0,0 +1,73 @@
+#ifndef __RNP_REGS_H__
+#define __RNP_REGS_H__
+
+#include "rnp_osdep.h"
+
+/* mac address offset */
+#define RNP_DMA_CTRL   (0x4)
+#define RNP_VEB_BYPASS_EN  BIT(4)
+#define RNP_DMA_MEM_CFG_LE (0 << 5)
+#define TSNR10_DMA_MEM_CFG_BE  (1 << 5)
+#define RNP_DMA_SCATTER_MEM_SHIFT  (16)
+
+#define RNP_FIRMWARE_SYNC  (0xc)
+#define RNP_FIRMWARE_SYNC_MASK GENMASK(31, 16)
+#define RNP_FIRMWARE_SYNC_MAGIC(0xa5a4)
+#define RNP_DRIVER_REMOVE  (0x5a00)
+/* 1BIT <-> 16 bytes Dma Addr Size*/
+#define RNP_DMA_SCATTER_MEM_MASK   GENMASK(31, 16)
+#define RNP_DMA_TX_MAP_MODE_SHIFT  (12)
+#define RNP_DMA_TX_MAP_MODE_MASK   GENMASK(15, 12)
+#define RNP_DMA_RX_MEM_PAD_EN  BIT(8)
+/* === queue register = */
+/* enable */
+#define RNP_DMA_RXQ_START(qid) _RING_(0x0010 + 0x100 * (qid))
+#define RNP_DMA_RXQ_READY(qid) _RING_(0x0014 + 0x100 * (qid))
+#define RNP_DMA_TXQ_START(qid) _RING_(0x0018 + 0x100 * (qid))
+#define RNP_DMA_TXQ_READY(qid) _RING_(0x001c + 0x100 * (qid))
+
+#define RNP_DMA_INT_STAT(qid)  _RING_(0x0020 + 0x100 * (qid))
+#define RNP_DMA_INT_MASK(qid)  _RING_(0x0024 + 0x100 * (qid))
+#define RNP_TX_INT_MASKBIT(1)
+#define RNP_RX_INT_MASKBIT(0)
+#define RNP_DMA_INT_CLER(qid)  _RING_(0x0028 + 0x100 * (qid))
+
+/* rx-queue */
+#define RNP_DMA_RXQ_BASE_ADDR_HI(qid)  _RING_(0x0030 + 0x100 * (qid))
+#define RNP_DMA_RXQ_BASE_ADDR_LO(qid)  _RING_(0x0034 + 0x100 * (qid))
+#define RNP_DMA_RXQ_LEN(qid)   _RING_(0x0038 + 0x100 * (qid))
+#define RNP_DMA_RXQ_HEAD(qid)  _RING_(0x003c + 0x100 * (qid))
+#define 

[PATCH v4 6/8] net/rnp add port info resource init

[Wenbo Cao]

Add Api For FW Mac Info, Port Resoucre info init Code
For Different Shape Of Nic

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_api.c |  48 +++
 drivers/net/rnp/base/rnp_api.h |  10 ++
 drivers/net/rnp/base/rnp_hw.h  |  18 +++
 drivers/net/rnp/meson.build|   1 +
 drivers/net/rnp/rnp.h  |  88 +
 drivers/net/rnp/rnp_ethdev.c   | 224 +++--
 drivers/net/rnp/rnp_mbx_fw.c   | 112 +
 drivers/net/rnp/rnp_mbx_fw.h   | 115 +
 drivers/net/rnp/rnp_rxtx.c |  83 
 drivers/net/rnp/rnp_rxtx.h |  14 +++
 10 files changed, 706 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/rnp/rnp_rxtx.c
 create mode 100644 drivers/net/rnp/rnp_rxtx.h

diff --git a/drivers/net/rnp/base/rnp_api.c b/drivers/net/rnp/base/rnp_api.c
index 550da6217d..cf74769fb6 100644
--- a/drivers/net/rnp/base/rnp_api.c
+++ b/drivers/net/rnp/base/rnp_api.c
@@ -21,3 +21,51 @@ rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw)
return ops->reset_hw(hw);
return -EOPNOTSUPP;
 }
+
+int
+rnp_get_mac_addr(struct rte_eth_dev *dev, uint8_t *macaddr)
+{
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+
+   if (!macaddr)
+   return -EINVAL;
+   if (ops->get_mac_addr)
+   return ops->get_mac_addr(port, port->attr.nr_lane, macaddr);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_set_default_mac(struct rte_eth_dev *dev, uint8_t *mac_addr)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->set_default_mac)
+   return ops->set_default_mac(port, mac_addr);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_set_rafb(struct rte_eth_dev *dev, uint8_t *addr,
+uint8_t vm_pool, uint8_t index)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->set_rafb)
+   return ops->set_rafb(port, addr, vm_pool, index);
+   return -EOPNOTSUPP;
+}
+
+int
+rnp_clear_rafb(struct rte_eth_dev *dev,
+  uint8_t vm_pool, uint8_t index)
+{
+   const struct rnp_mac_api *ops = RNP_DEV_TO_MAC_OPS(dev);
+   struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
+
+   if (ops->clear_rafb)
+   return ops->clear_rafb(port, vm_pool, index);
+   return -EOPNOTSUPP;
+}
diff --git a/drivers/net/rnp/base/rnp_api.h b/drivers/net/rnp/base/rnp_api.h
index df574dab77..b998b11237 100644
--- a/drivers/net/rnp/base/rnp_api.h
+++ b/drivers/net/rnp/base/rnp_api.h
@@ -4,4 +4,14 @@ int
 rnp_init_hw(struct rte_eth_dev *dev);
 int
 rnp_reset_hw(struct rte_eth_dev *dev, struct rnp_hw *hw);
+int
+rnp_get_mac_addr(struct rte_eth_dev *dev, uint8_t *macaddr);
+int
+rnp_set_default_mac(struct rte_eth_dev *dev, uint8_t *mac_addr);
+int
+rnp_set_rafb(struct rte_eth_dev *dev, uint8_t *addr,
+   uint8_t vm_pool, uint8_t index);
+int
+rnp_clear_rafb(struct rte_eth_dev *dev,
+   uint8_t vm_pool, uint8_t index);
 #endif /* __RNP_API_H__ */
diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 57b7dc75a0..395b9d5c71 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -44,6 +44,10 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_rd_reg((uint8_t *)((_hw)->comm_reg_base) + (_off))
 #define rnp_top_wr(_hw, _off, _val)\
rnp_wr_reg((uint8_t *)((_hw)->comm_reg_base) + (_off), (_val))
+#define RNP_MACADDR_UPDATE_LO(hw, hw_idx, val) \
+   rnp_eth_wr(hw, RNP_RAL_BASE_ADDR(hw_idx), val)
+#define RNP_MACADDR_UPDATE_HI(hw, hw_idx, val) \
+   rnp_eth_wr(hw, RNP_RAH_BASE_ADDR(hw_idx), val)
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
@@ -112,9 +116,23 @@ struct rnp_mbx_info {
rte_atomic16_t state;
 } __rte_cache_aligned;
 
+struct rnp_eth_port;
 struct rnp_mac_api {
int32_t (*init_hw)(struct rnp_hw *hw);
int32_t (*reset_hw)(struct rnp_hw *hw);
+   /* MAC Address */
+   int32_t (*get_mac_addr)(struct rnp_eth_port *port,
+   uint8_t lane,
+   uint8_t *macaddr);
+   int32_t (*set_default_mac)(struct rnp_eth_port *port, uint8_t *mac);
+   /* Receive Address Filter Table */
+   int32_t (*set_rafb)(struct rnp_eth_port *port,
+   uint8_t *mac,
+   uint8_t vm_pool,
+   uint8_t index);
+   int32_t (*clear_rafb)(struct rnp_eth_port *port,
+   uint8_t vm_pool,
+   uint8_t index);
 };
 
 struct rnp_mac_info {
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index c52566c357..7d63460c45 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -11,6 +11,7 @@ sources = f

[PATCH v4 7/8] net/rnp add devargs runtime parsing functions

[Wenbo Cao]

add various runtime devargs command line options
supported by this driver.

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/rnp.h|  22 +
 drivers/net/rnp/rnp_ethdev.c | 166 +++
 drivers/net/rnp/rnp_mbx_fw.c | 164 ++
 drivers/net/rnp/rnp_mbx_fw.h |  69 +++
 4 files changed, 421 insertions(+)

diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 6f216cc5ca..933cdc6007 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -107,6 +107,8 @@ struct rnp_eth_port {
struct rnp_eth_adapter *adapt;
uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
struct rnp_hw *hw;
+   uint8_t rx_func_sec; /* force set io rx_func */
+   uint8_t tx_func_sec; /* force set io tx func */
struct rte_eth_dev *eth_dev;
struct rnp_port_attr attr;
/* Recvice Mac Address Record Table */
@@ -122,6 +124,13 @@ struct rnp_share_ops {
const struct rnp_mac_api *mac_api;
 } __rte_cache_aligned;
 
+enum {
+   RNP_IO_FUNC_USE_NONE = 0,
+   RNP_IO_FUNC_USE_VEC,
+   RNP_IO_FUNC_USE_SIMPLE,
+   RNP_IO_FUNC_USE_COMMON,
+};
+
 struct rnp_eth_adapter {
enum rnp_work_mode mode;
enum rnp_resource_share_m s_mode; /* Port Resource Share Policy */
@@ -135,6 +144,19 @@ struct rnp_eth_adapter {
int max_link_speed;
uint8_t num_ports; /* Cur Pf Has physical Port Num */
uint8_t lane_mask;
+
+   uint8_t rx_func_sec; /* force set io rx_func */
+   uint8_t tx_func_sec; /* force set io tx func*/
+   /*fw-update*/
+   bool  do_fw_update;
+   char *fw_path;
+
+   bool loopback_en;
+   bool fw_sfp_10g_1g_auto_det;
+   int fw_force_speed_1g;
+#define FOCE_SPEED_1G_NOT_SET  (-1)
+#define FOCE_SPEED_1G_DISABLED (0)
+#define FOCE_SPEED_1G_ENABLED  (1)
 } __rte_cache_aligned;
 
 #define RNP_DEV_TO_PORT(eth_dev) \
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index ad99f99d4a..5313dae5a2 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "rnp.h"
 #include "rnp_api.h"
@@ -14,6 +15,13 @@
 #include "rnp_rxtx.h"
 #include "rnp_logs.h"
 
+#define RNP_HW_MAC_LOOPBACK_ARG  "hw_loopback"
+#define RNP_FW_UPDATE"fw_update"
+#define RNP_RX_FUNC_SELECT   "rx_func_sec"
+#define RNP_TX_FUNC_SELECT   "tx_func_sec"
+#define RNP_FW_4X10G_10G_1G_DET  "fw_4x10g_10g_1g_auto_det"
+#define RNP_FW_FORCE_SPEED_1G"fw_force_1g_speed"
+
 static int
 rnp_mac_rx_disable(struct rte_eth_dev *dev)
 {
@@ -108,6 +116,8 @@ rnp_init_port_resource(struct rnp_eth_adapter *adapter,
struct rnp_hw *hw = &adapter->hw;
 
port->adapt = adapter;
+   port->rx_func_sec = adapter->rx_func_sec;
+   port->tx_func_sec = adapter->tx_func_sec;
port->s_mode = adapter->s_mode;
port->port_stopped = 1;
port->hw = hw;
@@ -443,6 +453,154 @@ rnp_special_ops_init(struct rte_eth_dev *eth_dev)
return 0;
 }
 
+static const char *const rnp_valid_arguments[] = {
+   RNP_HW_MAC_LOOPBACK_ARG,
+   RNP_FW_UPDATE,
+   RNP_RX_FUNC_SELECT,
+   RNP_TX_FUNC_SELECT,
+   RNP_FW_4X10G_10G_1G_DET,
+   RNP_FW_FORCE_SPEED_1G,
+   NULL
+};
+
+static int
+rnp_parse_handle_devarg(const char *key, const char *value,
+   void *extra_args)
+{
+   struct rnp_eth_adapter *adapter = NULL;
+
+   if (value == NULL || extra_args == NULL)
+   return -EINVAL;
+
+   if (strcmp(key, RNP_HW_MAC_LOOPBACK_ARG) == 0) {
+   uint64_t *n = extra_args;
+   *n = (uint16_t)strtoul(value, NULL, 10);
+   if (*n > UINT16_MAX && errno == ERANGE) {
+   RNP_PMD_DRV_LOG(ERR, "invalid extra param value\n");
+   return -1;
+   }
+   } else if (strcmp(key, RNP_FW_UPDATE) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   adapter->do_fw_update = true;
+   adapter->fw_path = strdup(value);
+   } else if (strcmp(key, RNP_FW_4X10G_10G_1G_DET) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   if (adapter->num_ports == 2 && adapter->hw.speed == 10 * 1000) {
+   adapter->fw_sfp_10g_1g_auto_det =
+   (strcmp(value, "on") == 0) ? true : false;
+   } else {
+   adapter->fw_sfp_10g_1g_auto_det = false;
+   }
+   } else if (strcmp(key, RNP_FW_FORCE_SPEED_1G) == 0) {
+   adapter = (struct rnp_eth_adapter *)extra_args;
+   if (adapter->num_ports == 2) {
+   if (strcmp(value, "on") == 0)
+   adapter->fw_force_speed_1g = 
FOCE_SPEED_1G_ENABLED;
+   else if (strcmp(value, "off") == 0)
+

[PATCH v4 8/8] net/rnp handle device interrupts

[Wenbo Cao]

Handle device lsc interrupt event

Signed-off-by: Wenbo Cao 
---
 drivers/net/rnp/base/rnp_hw.h   |   5 +
 drivers/net/rnp/base/rnp_mac_regs.h | 279 
 drivers/net/rnp/rnp.h   |   8 +
 drivers/net/rnp/rnp_ethdev.c|  17 ++
 drivers/net/rnp/rnp_mbx.h   |   3 +-
 drivers/net/rnp/rnp_mbx_fw.c| 233 +++
 drivers/net/rnp/rnp_mbx_fw.h|  38 +++-
 7 files changed, 580 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/rnp/base/rnp_mac_regs.h

diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h
index 395b9d5c71..5c50484c6c 100644
--- a/drivers/net/rnp/base/rnp_hw.h
+++ b/drivers/net/rnp/base/rnp_hw.h
@@ -10,6 +10,7 @@
 #include "rnp_osdep.h"
 #include "rnp_dma_regs.h"
 #include "rnp_eth_regs.h"
+#include "rnp_mac_regs.h"
 #include "rnp_cfg.h"
 
 static inline unsigned int rnp_rd_reg(volatile void *addr)
@@ -48,6 +49,10 @@ static inline void rnp_wr_reg(volatile void *reg, int val)
rnp_eth_wr(hw, RNP_RAL_BASE_ADDR(hw_idx), val)
 #define RNP_MACADDR_UPDATE_HI(hw, hw_idx, val) \
rnp_eth_wr(hw, RNP_RAH_BASE_ADDR(hw_idx), val)
+#define rnp_mac_rd(hw, id, off) \
+   rnp_rd_reg((char *)(hw)->mac_base[id] + (off))
+#define rnp_mac_wr(hw, id, off, val) \
+   rnp_wr_reg((char *)(hw)->mac_base[id] + (off), val)
 struct rnp_hw;
 /* Mbx Operate info */
 enum MBX_ID {
diff --git a/drivers/net/rnp/base/rnp_mac_regs.h 
b/drivers/net/rnp/base/rnp_mac_regs.h
new file mode 100644
index 00..f9466b3841
--- /dev/null
+++ b/drivers/net/rnp/base/rnp_mac_regs.h
@@ -0,0 +1,279 @@
+#ifndef __RNP_MAC_REGS_H__
+#define __RNP_MAC_REGS_H__
+
+#include "rnp_osdep.h"
+#define RNP_MAC_TX_CFG (0x0)
+
+/* Transmitter Enable */
+#define RNP_MAC_TE BIT(0)
+/* Jabber Disable */
+#define RNP_MAC_JD BIT(16)
+#define RNP_SPEED_SEL_1G   (BIT(30) | BIT(29) | BIT(28))
+#define RNP_SPEED_SEL_10G  BIT(30)
+#define RNP_SPEED_SEL_40G  (0)
+#define RNP_MAC_RX_CFG (0x4)
+/* Receiver Enable */
+#define RNP_MAC_RE BIT(0)
+/* Automatic Pad or CRC Stripping */
+#define RNP_MAC_ACSBIT(1)
+/* CRC stripping for Type packets */
+#define RNP_MAC_CSTBIT(2)
+/* Disable CRC Check */
+#define RNP_MAC_DCRCC  BIT(3)
+/* Enable Max Frame Size Limit */
+#define RNP_MAC_GPSLCE BIT(6)
+/* Watchdog Disable */
+#define RNP_MAC_WD BIT(7)
+/* Jumbo Packet Support En */
+#define RNP_MAC_JE BIT(8)
+/* Loopback Mode */
+#define RNP_MAC_LM BIT(10)
+/* Giant Packet Size Limit */
+#define RNP_MAC_GPSL_MASK  GENMASK(29, 16)
+#define RNP_MAC_MAX_GPSL   (1518)
+#define RNP_MAC_CPSL_SHIFT (16)
+
+#define RNP_MAC_PKT_FLT_CTRL   (0x8)
+
+/* Receive All */
+#define RNP_MAC_RA BIT(31)
+/* Pass Control Packets */
+#define RNP_MAC_PCFGENMASK(7, 6)
+#define RNP_MAC_PCF_OFFSET (6)
+/* Mac Filter ALL Ctrl Frame */
+#define RNP_MAC_PCF_FAC(0)
+/* Mac Forward ALL Ctrl Frame Except Pause */
+#define RNP_MAC_PCF_NO_PAUSE   (1)
+/* Mac Forward All Ctrl Pkt */
+#define RNP_MAC_PCF_PA (2)
+/* Mac Forward Ctrl Frame Match Unicast */
+#define RNP_MAC_PCF_PUN(3)
+/* Promiscuous Mode */
+#define RNP_MAC_PROMISC_EN BIT(0)
+/* Hash Unicast */
+#define RNP_MAC_HUCBIT(1)
+/* Hash Multicast */
+#define RNP_MAC_HMCBIT(2)
+/*  Pass All Multicast */
+#define RNP_MAC_PM BIT(4)
+/* Disable Broadcast Packets */
+#define RNP_MAC_DBFBIT(5)
+/* Hash or Perfect Filter */
+#define RNP_MAC_HPFBIT(10)
+#define RNP_MAC_VTFE   BIT(16)
+/* Interrupt Status */
+#define RNP_MAC_INT_STATUS _MAC_(0xb0)
+#define RNP_MAC_LS_MASKGENMASK(25, 24)
+#define RNP_MAC_LS_UP  (0)
+#define RNP_MAC_LS_LOCAL_FAULT BIT(25)
+#define RNP_MAC_LS_REMOTE_FAULT(BIT(25) | BIT(24))
+/* Unicast Mac Hash Table */
+#define RNP_MAC_UC_HASH_TB(n)  _MAC_(0x10 + ((n) * 0x4))
+
+
+#define RNP_MAC_LPI_CTRL   (0xd0)
+
+/* PHY Link Status Disable */
+#define RNP_MAC_PLSDIS BIT(18)
+/* PHY Link Status */
+#define RNP_MAC_PLSBIT(17)
+
+/* MAC VLAN CTRL Strip REG */
+#define RNP_MAC_VLAN_TAG   (0x50)
+
+/* En Inner VLAN Strip Action */
+#define RNP_MAC_EIVLS  GENMASK(29, 28)
+/* Inner VLAN Strip Action Shift */
+#define RNP_MAC_IV_EIVLS_SHIFT (28)
+/* Inner Vlan Don't Strip*/
+#define RNP_MAC_IV_STRIP_NONE  (0x0)
+/* Inner Vlan Strip When Filter Match Success */
+#define RNP_MAC_IV_STRIP_PASS  (0x1)
+/* I

Re: [PATCH] telemetry: avoid truncation of strlcpy return before check

[Bruce Richardson]

On Wed, Aug 02, 2023 at 02:21:01PM -0700, Tyler Retzlaff wrote:
> strlcpy returns type size_t when directly assigning to
> struct rte_tel_data data_len field it may be truncated leading to
> compromised length check that follows
> 
> Since the limit in the check is < UINT_MAX the value returned is
> safe to be cast to unsigned int (which may be narrower than size_t)
> but only after being checked against RTE_TEL_MAX_SINGLE_STRING_LEN
> 
> Signed-off-by: Tyler Retzlaff 
> ---
Acked-by: Bruce Richardson 

This probably should be marked as a fix for backport.

>  lib/telemetry/telemetry_data.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
> index 3b1a240..52307cb 100644
> --- a/lib/telemetry/telemetry_data.c
> +++ b/lib/telemetry/telemetry_data.c
> @@ -41,12 +41,13 @@
>  int
>  rte_tel_data_string(struct rte_tel_data *d, const char *str)
>  {
> + const size_t len = strlcpy(d->data.str, str, sizeof(d->data.str));
>   d->type = TEL_STRING;
> - d->data_len = strlcpy(d->data.str, str, sizeof(d->data.str));
> - if (d->data_len >= RTE_TEL_MAX_SINGLE_STRING_LEN) {
> + if (len >= RTE_TEL_MAX_SINGLE_STRING_LEN) {
>   d->data_len = RTE_TEL_MAX_SINGLE_STRING_LEN - 1;
>   return E2BIG; /* not necessarily and error, just truncation */
>   }
> + d->data_len = (unsigned int)len;
>   return 0;
>  }
>  
> -- 
> 1.8.3.1
> 

Re: Drivers, architectures, processor families, etc.

[Bruce Richardson]

On Wed, Aug 02, 2023 at 03:47:59PM -0700, Stephen Hemminger wrote:
> On Wed, 2 Aug 2023 15:49:54 -0600
> Philip Prindeville  wrote:
> 
> > Hi,
> > 
> > I'm trying to come up with some Kconfig logic for OpenWRT packaging to help 
> > users select the right build options for their hardware.
> > 
> > Most OpenWRT developers typically cross-compile, so we obviously can't rely 
> > on detection on the build host as that's rarely the same as the target 
> > machine.
> > 
> > Looking in the DPDK repo, I don't see any description of the available 
> > architectures, drivers, etc. and what I had seen previously was (if I 
> > remember) only for x86_64 hardware, and even that I can't seem to locate 
> > again.
> > 
> > Would it make sense to put some of these definitions into the repo itself, 
> > so that when new drivers are added, that stands out (at least in the commit 
> > logs) and we can capture the permutations of what driver goes with which 
> > SoC on what architecture, etc?
> > 
> > Thanks,
> > 
> > -Philip
> > 
> 
> DPDK now uses meson which by default builds everything available on the build 
> architecture.
> There is intentionally no way to disable drivers, you can disable some 
> libraries though.

Actually, we do now support disabling drivers, and also only selectively
enabling specific ones. See disable_drivers and enable_drivers meson
options.

To find our different architecture support, I suggest looking in the config
directory. The subfolders there often contain cross-files for meson for
building for various architectures. For example, config/arm, contains a
number of reference files for cross-compiling for different arm platforms.

Regards,
/Bruce

[PATCH v2] eventdev/crypto: fix circular buffer full case

[Ganapati Kundapura]

crypto ops from the circular buffer are not getting flushed
to crypto dev when crypto dev becomes busy and circular buffer
gets full.

Fix it by flushing ops from circular buffer when circ buffer is full
instead of returning without flushing.

Fixes: 2ae84b39ae7b ("eventdev/crypto: store operations in circular buffer")
Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_crypto_adapter.c 
b/lib/eventdev/rte_event_crypto_adapter.c
index 52a28e5..1b435c9 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -248,9 +248,18 @@ eca_circular_buffer_flush_to_cdev(struct 
crypto_ops_circular_buffer *bufp,
n = *tailp - *headp;
else if (*tailp < *headp)
n = bufp->size - *headp;
-   else {
-   *nb_ops_flushed = 0;
-   return 0;  /* buffer empty */
+   else { /* head == tail case */
+   /* when head == tail,
+* circ buff is either full(tail pointer roll over) or empty
+*/
+   if (bufp->count != 0) {
+   /* circ buffer is full */
+   n = bufp->count;
+   } else {
+   /* circ buffer is empty */
+   *nb_ops_flushed = 0;
+   return 0;  /* buffer empty */
+   }
}
 
*nb_ops_flushed = rte_cryptodev_enqueue_burst(cdev_id, qp_id,
-- 
2.6.4

RE: [PATCH v1] eventdev/crypto: flush ops when circ buffer is full

[Kundapura, Ganapati]

Hi Jerin,

> -Original Message-
> From: Jerin Jacob 
> Sent: Wednesday, August 2, 2023 9:47 PM
> To: Kundapura, Ganapati 
> Cc: jer...@marvell.com; Jayatheerthan, Jay ;
> Naga Harish K, S V ; Gujjar, Abhinandan S
> ; dev@dpdk.org
> Subject: Re: [PATCH v1] eventdev/crypto: flush ops when circ buffer is full
> 
> On Tue, Aug 1, 2023 at 11:15 AM Ganapati Kundapura
>  wrote:
> >
> > crypto ops from the circ buffer are not getting flushed to crypto dev
> > when crypto dev becomes busy and circ buffer gets full.
> >
> > This patch flushes ops from circ buffer when circ buffer is full
> > instead of returning without flushing.
> 
> 
> Since it is bug, Please add Fixes: tag , Also change description accordingly.
> 
Updated in v2
> > Signed-off-by: Ganapati Kundapura 
> >
> > diff --git a/lib/eventdev/rte_event_crypto_adapter.c
> > b/lib/eventdev/rte_event_crypto_adapter.c
> > index 52a28e5..1b435c9 100644
> > --- a/lib/eventdev/rte_event_crypto_adapter.c
> > +++ b/lib/eventdev/rte_event_crypto_adapter.c
> > @@ -248,9 +248,18 @@ eca_circular_buffer_flush_to_cdev(struct
> crypto_ops_circular_buffer *bufp,
> > n = *tailp - *headp;
> > else if (*tailp < *headp)
> > n = bufp->size - *headp;
> > -   else {
> > -   *nb_ops_flushed = 0;
> > -   return 0;  /* buffer empty */
> > +   else { /* head == tail case */
> > +   /* when head == tail,
> > +* circ buff is either full(tail pointer roll over) or empty
> > +*/
> > +   if (bufp->count != 0) {
> > +   /* circ buffer is full */
> > +   n = bufp->count;
> > +   } else {
> > +   /* circ buffer is empty */
> > +   *nb_ops_flushed = 0;
> > +   return 0;  /* buffer empty */
> > +   }
> > }
> >
> > *nb_ops_flushed = rte_cryptodev_enqueue_burst(cdev_id, qp_id,
> > --
> > 2.6.4
> >

RE: [PATCH] ethdev: introduce generic flow item and action

[Ori Kam]

Hi Cristian,

> -Original Message-
> From: Dumitrescu, Cristian 
> Sent: Wednesday, August 2, 2023 7:57 PM
> 
> 
> 
> > -Original Message-
> > From: Ori Kam 
> > Sent: Wednesday, August 2, 2023 4:47 PM
> > To: Morten Brørup ; Dumitrescu, Cristian
> > ; Jerin Jacob 
> > Cc: Zhang, Qi Z ; NBU-Contact-Thomas Monjalon
> > (EXTERNAL) ; david.march...@redhat.com;
> > Richardson, Bruce ; jer...@marvell.com;
> > ferruh.yi...@amd.com; techbo...@dpdk.org; Mcnamara, John
> > ; Zhang, Helin ;
> > dev@dpdk.org
> > Subject: RE: [PATCH] ethdev: introduce generic flow item and action
> >
> > Hi Qi
> 
> Hi Ori,
> 
> Thanks for your input!
> 
> >
> > > -Original Message-
> > > From: Morten Brørup 
> > > Sent: Wednesday, August 2, 2023 6:25 PM
> > >
> > > > From: Dumitrescu, Cristian [mailto:cristian.dumitre...@intel.com]
> > > > Sent: Wednesday, 2 August 2023 16.06
> > > >
> > > > > From: Jerin Jacob 
> > > > > Sent: Wednesday, August 2, 2023 12:22 PM
> > > > >
> > > > > On Wed, Aug 2, 2023 at 4:31 PM Morten Brørup
> > > > >  wrote:
> > > > > >
> > > > > > > From: Morten Brørup [mailto:m...@smartsharesystems.com]
> > > > > > > Sent: Wednesday, 2 August 2023 12.25
> > > > > > >
> > > > > > > > From: Qi Zhang [mailto:qi.z.zh...@intel.com]
> > > > > > > > Sent: Wednesday, 2 August 2023 19.35
> > > > > > > >
> > > > > > > > From: Cristian Dumitrescu 
> > > > > > > >
> > > > > > > > For network devices that are programmable through languages
> > such as
> > > > > > > > the P4 language, there are no pre-defined flow items and 
> > > > > > > > actions.
> > > > > > > >
> > > > > > > > The format of the protocol header and metadata fields that are
> > used to
> > > > > > > > specify the flow items that make up the flow pattern, as well 
> > > > > > > > as the
> > > > > > > > flow actions, are all defined by the program, with an infinity 
> > > > > > > > of
> > > > > > > > possible combinations, as opposed to being selected from a 
> > > > > > > > finite
> > > > > > > > pre-defined list.
> > > > > > > >
> > > > > > > > It is virtually impossible to pre-define all the flow items and 
> > > > > > > > the
> > > > > > > > flow actions that programs might ever use, as these are only
> > limited
> > > > > > > > by the set of HW resources and the program developer's
> > imagination.
> > > > > > > >
> > > > > > > > To support the programmable network devices, we are introducing:
> > > > > > > >
> > > > > > > > * A generic flow item: The flow item is expressed as an array of
> > bytes
> > > > > > > > of a given length, whose meaning is defined by the program 
> > > > > > > > loaded
> > by
> > > > > > > > the network device.
> > > > > > >
> > > > > > > The flow item is not "generic", it is "opaque": Only the 
> > > > > > > application
> > > > knows
> > > > > > > what this flow item does.
> > > > > > >
> > > > > > > I hate the concept for two reasons:
> > > > > > > 1. The inability for applications to detect which flow items the
> > > > underlying
> > > > > > > hardware supports.
> > > > > > > 2. The risk that vendors will use this instead of introducing new 
> > > > > > > flow
> > > > item
> > > > > > > types, available for anyone to implement.
> > > > > >
> > > > > > After further consideration, there might be a middle ground.
> > > > > >
> > > > > > Consider Vendor-Specific attributes for DHCP and RADIUS, or SNMP
> > > MIBs...
> > > > > >
> > > > > > Any vendor is free to add his own, proprietary special-purpose
> > attributes,
> > > > > without going through the standardization process. (This is the key
> > > > challenge
> > > > > this patch seems to be aiming at.)
> > > > > >
> > > > > > The vendor might publish these attributes, and other vendors may
> > > > > implement them too.
> > > > > >
> > > > > > And in order to prevent collisions, the Vendor-Specific attributes
> > contain
> > > > a
> > > > > globally unique vendor ID, such as the Private Enterprise Number [1]
> > > > > managed by IANA.
> > > > > >
> > > > > > If similar principles can be worked into the patch, I can support 
> > > > > > it.
> > > > >
> > > > > +1
> > > > >
> > +1 I understand that this is supposed to be generic, but how can it?
> 
> What exactly it not generic?
> 
> > how do you know if PMD supports this?
> 
> What is the current RTE_FLOW mechanism to find out whether a device/PMD
> supports a certain flow? The only mechanism available is to try to create the
> flow (rte_flow_create) or mimic the creation of the flow (rte_flow_validate)
> and see if you get success or error, right? Same mechanism to be used here.
> Of course, we would be happy to support the addition of a more complex
> query mechanism in RTE_FLOW.
> 

My bad explanation, you are right the way to know if some PMD supports a feature
is trial and error, what I ment is how PMD knows how to phrase the data, it 
should be 
in a known format.

> > what if each PMD needs different configurations?
> 
> Not sure what you're referring to exactly. The format of the flow items and
> f

[Question/Issue] pkgconfig does not include dpdk/drivers libs

[Abhineet Pandey]

I’m consuming dpdk via spdk.
I was trying to use pkg-config for a Makefile that I’m writing,

Executing:
PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs --static libdpdk

Output:
-Wl,--whole-archive -Wl,--no-whole-archive -Wl,--as-needed -pthread 
-L/home/nutanix/exact_spdk/spdk/dpdk/build/lib -l:librte_bus_pci.a 
-l:librte_bus_vdev.a -l:librte_mempool_ring.a -l:librte_vhost.a 
-l:librte_security.a -l:librte_reorder.a -l:librte_power.a 
-l:librte_cryptodev.a -l:librte_compressdev.a -l:librte_timer.a 
-l:librte_hash.a -l:librte_cmdline.a -l:librte_pci.a -l:librte_ethdev.a 
-l:librte_meter.a -l:librte_net.a -l:librte_mbuf.a -l:librte_mempool.a 
-l:librte_rcu.a -l:librte_ring.a -l:librte_eal.a -l:librte_telemetry.a 
-l:librte_kvargs.a -lrte_vhost -lrte_security -lrte_reorder -lrte_power 
-lrte_cryptodev -lrte_compressdev -lrte_timer -lrte_hash -lrte_cmdline 
-lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_rcu 
-lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -lm -ldl -lnuma

At a closer look, you’ll see -l:librte_bus_pci.a -l:librte_bus_vdev.a 
-l:librte_mempool_ring.a, but you won’t find corresponding -lrte_bus_pci, 
-lrte_bus_vdev, -lrte_mempool_ring. This showed up in my use case as 
rte_mempool_ring has some functions which execute on startup via 
__attribute__((constructor)), and they did not execute thus causing issues.

I think the issue is that in pkgconfig we reference ‘dpdk_libraries’, which is 
updated libs/meson.build, but not updated in drivers/meson.build.

If I apply this fix:

--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -277,7 +277,7 @@ foreach subpath:subdirs
 static_dep = declare_dependency(
 include_directories: includes,
 dependencies: static_deps)
-
+dpdk_libraries = [shared_lib] + dpdk_libraries
  dpdk_drivers += static_lib

Then things work well and I see -lrte_bus_pci, -lrte_bus_vdev, 
-lrte_mempool_ring in output of:
PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs --static libdpdk

Please let me know if the current behavior is expected, or this change is 
needed.

Regards
Abhineet Pandey

Re: [PATCH v2] doc: build manpages as well as html output

[David Marchand]

On Mon, Jul 17, 2023 at 1:09 PM Bruce Richardson
 wrote:
> > There may be some polishing to do later.
> > Looking at the result for rte_eal_init, I see that the generated
> > manual starts with a reference to the rte_eal.h header with a path
> > relative to its location in the DPDK tree.
> > $ MANPATH=build-gcc/install/share/man man rte_eal_init | head -5
> > lib/eal/include/rte_eal.h(3)
> >DPDK
> >
> > lib/eal/include/rte_eal.h(3)
> >
> > NAME
> >lib/eal/include/rte_eal.h
> >
> > At least, it is possible to ask for this header man with "man
> > rte_eal.h", but it is a bit confusing.
> > Is there something we can do on this side?
> >
>
> Not sure, not really familiar with how doxygen works generating manpages
> and the options supported, etc. etc. Mainly I just looked at the
> build-system side to support this, since I really missed having manpages
> for DPDK functions to quickly check parameter order.

doxygen is invoked on the sources tree, so this is probably the reason
why such path is in the generated manual.
Maybe Thomas has an idea how we could handle this.

In any case, I am fine with this patch as it is now.


-- 
David Marchand

Re: [PATCH v4] build: update DPDK to use C11 standard

[David Marchand]

On Wed, Aug 2, 2023 at 3:41 PM Patrick Robb  wrote:
> On Wed, Aug 2, 2023 at 2:32 AM David Marchand  
> wrote:
>>
>> What about the LTS releases testing?
>
> Okay, we will disable rhel7 testing for dpdk main and next branches, but 
> leave testing on for the LTS releases.

Thank you Patrick.


-- 
David Marchand

[PATCH] eal: remove RTE_FUNC_PTR_* deprecated macros

[David Marchand]

The RTE_FUNC_PTR_OR_* macros were marked as deprecated in v22.11, we can
remove them.

Signed-off-by: David Marchand 
---
 devtools/cocci/func_or_ret.cocci   | 12 
 doc/guides/rel_notes/deprecation.rst   |  4 
 doc/guides/rel_notes/release_23_11.rst |  2 ++
 lib/eal/include/rte_dev.h  | 13 -
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 devtools/cocci/func_or_ret.cocci

diff --git a/devtools/cocci/func_or_ret.cocci b/devtools/cocci/func_or_ret.cocci
deleted file mode 100644
index f23d60cc4e..00
--- a/devtools/cocci/func_or_ret.cocci
+++ /dev/null
@@ -1,12 +0,0 @@
-@@
-expression cond, ret;
-@@
--RTE_FUNC_PTR_OR_ERR_RET(cond, ret);
-+if (cond == NULL)
-+  return ret;
-@@
-expression cond;
-@@
--RTE_FUNC_PTR_OR_RET(cond);
-+if (cond == NULL)
-+  return;
diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 494b401cda..502dd3a28c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -51,10 +51,6 @@ Deprecation Notices
   are renamed to ``rte_tel_data_add_array_uint`` and 
``rte_tel_data_add_dict_uint`` respectively.
   As such, the old function names are deprecated and will be removed in a 
future release.
 
-* eal: RTE_FUNC_PTR_OR_* macros have been marked deprecated and will be removed
-  in the future. Applications can use ``devtools/cocci/func_or_ret.cocci``
-  to update their code.
-
 * eal: The functions ``rte_thread_setname`` and ``rte_ctrl_thread_create``
   are planned to be deprecated starting with the 23.07 release, subject to
   the replacement API rte_thread_set_name and rte_thread_create_control being
diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rst
index 6b4dd21fd0..f644f03def 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -68,6 +68,8 @@ Removed Items
Also, make sure to start the actual text at the margin.
===
 
+* eal: Removed deprecated ``RTE_FUNC_PTR_OR_*`` macros.
+
 
 API Changes
 ---
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index dc1acc8953..8568535ac0 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -42,19 +42,6 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name,
enum rte_dev_event_type event,
void *cb_arg);
 
-/* Macros to check for invalid function pointers */
-#define RTE_FUNC_PTR_OR_ERR_RET(func, retval) 
RTE_DEPRECATED(RTE_FUNC_PTR_OR_ERR_RET) \
-do { \
-   if ((func) == NULL) \
-   return retval; \
-} while (0)
-
-#define RTE_FUNC_PTR_OR_RET(func) RTE_DEPRECATED(RTE_FUNC_PTR_OR_RET) \
-do { \
-   if ((func) == NULL) \
-   return; \
-} while (0)
-
 /**
  * Device policies.
  */
-- 
2.41.0

Re: [PATCH] eal: remove RTE_FUNC_PTR_* deprecated macros

[Bruce Richardson]

On Thu, Aug 03, 2023 at 11:41:18AM +0200, David Marchand wrote:
> The RTE_FUNC_PTR_OR_* macros were marked as deprecated in v22.11, we can
> remove them.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 01/14] drivers: remove duplicated PCI master control

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:24AM +0200, David Marchand wrote:
> Use existing API to cleanup duplicated code.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 02/14] bus/pci: add const to some experimental API

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:25AM +0200, David Marchand wrote:
> Those functions are fine with a const on the device pointer.
> 
> Signed-off-by: David Marchand 
> ---
>  drivers/bus/pci/pci_common.c  | 4 ++--
>  drivers/bus/pci/rte_bus_pci.h | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> index 52404ab0fe..382b0b8946 100644
> --- a/drivers/bus/pci/pci_common.c
> +++ b/drivers/bus/pci/pci_common.c
> @@ -814,7 +814,7 @@ rte_pci_get_iommu_class(void)
>  }
>  
>  off_t
> -rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap)
> +rte_pci_find_ext_capability(const struct rte_pci_device *dev, uint32_t cap)
>  {
>   off_t offset = RTE_PCI_CFG_SPACE_SIZE;
>   uint32_t header;
> @@ -857,7 +857,7 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
> uint32_t cap)
>  }
>  
>  int
> -rte_pci_set_bus_master(struct rte_pci_device *dev, bool enable)
> +rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable)
>  {
>   uint16_t old_cmd, cmd;
>  

While generally I'm a big fan of using const everywhere we can, I wonder if
this is confusing here, since you are changing a setting, i.e. it's not
a read-only function.
That said, since const works, I have no strong objection to going with it.

Acked-by: Bruce Richardson 

Re: [PATCH 03/14] bus/pci: find PCI capability

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:26AM +0200, David Marchand wrote:
> Introduce two helpers so that drivers stop reinventing the wheel.
> Use it in existing drivers.
> 

Can you give a little more context on the new helpers and the changes in
the patch? A lot of the changes are not that self-explanatory.

Thanks,
/Bruce

Re: [PATCH 04/14] pci: define some capability constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:27AM +0200, David Marchand wrote:
> Define some PCI capability constants and use them in existing drivers.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 03/14] bus/pci: find PCI capability

[Bruce Richardson]

On Thu, Aug 03, 2023 at 10:49:54AM +0100, Bruce Richardson wrote:
> On Thu, Aug 03, 2023 at 09:50:26AM +0200, David Marchand wrote:
> > Introduce two helpers so that drivers stop reinventing the wheel.
> > Use it in existing drivers.
> > 
> 
> Can you give a little more context on the new helpers and the changes in
> the patch? A lot of the changes are not that self-explanatory.
> 
Reading through the patch a second time, I get a better idea of what is
happening, and it looks fine [though still think a little more detail is
needed in the log]

Acked-by: Bruce Richardson 

Re: [PATCH 05/14] pci: define some MSIX constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:28AM +0200, David Marchand wrote:
> Define some PCI MSIX constants and use them in existing drivers.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 06/14] pci: define some command constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:29AM +0200, David Marchand wrote:
> Define some PCI command constants and use them in existing drivers.
> 
> Signed-off-by: David Marchand 
> ---

For the idea, all good, but for the implementation, one comment inline
below.

With the below reworked:

Acked-by: Bruce Richardson 

>  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_STATUS0x4
> -#define DLB2_PCI_COMMAND_INTX_DISABLE0x400
>  #define DLB2_PCI_ACS_CAP 0x4
>  #define DLB2_PCI_ACS_CTRL0x6
>  #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_ID0x00/* 16 bits */
>  #define RTE_PCI_DEVICE_ID0x02/* 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 */
>  

It's weird here to have two defines in the same block with the same value -
even if one is 0x04 and the other is 0x4. That implies that the two values
don't belong in the same block of defines.

Question - would enums make sense for defining any of these? It allows
the groups to be named?


>  /* PCI Status Register */
>  #define RTE_PCI_STATUS   0x06/* 16 bits */
> -- 
> 2.41.0
> 

Re: [PATCH 07/14] pci: define some BAR constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:30AM +0200, David Marchand wrote:
> Define some PCI BAR constants and use them in existing drivers.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 08/14] pci: define some PM constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:31AM +0200, David Marchand wrote:
> Define some PCI Power Management constants and use them in existing
> drivers.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 09/14] pci: define some PCIe constants

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:32AM +0200, David Marchand wrote:
> Define some PCI Express constants and use them in existing drivers.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH 00/14] Cleanup PCI(e) drivers

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:50:23AM +0200, David Marchand wrote:
> Rather than rely on Linux headers to find some PCI(e) standard constants
> or reinvent the same PCI capability helper, this series complements the
> pci library and the pci bus driver.
> PCI drivers can then use OS agnostic macros and helpers.
> 
> WARNING: this is only compile tested.
> 
> -- 
> David Marchand
> 
> David Marchand (14):
>   drivers: remove duplicated PCI master control
>   bus/pci: add const to some experimental API
>   bus/pci: find PCI capability
>   pci: define some capability constants
>   pci: define some MSIX constants
>   pci: define some command constants
>   pci: define some BAR constants
>   pci: define some PM constants
>   pci: define some PCIe constants
>   pci: define some extended capability constants
>   pci: define some ACS constants
>   pci: define some PRI constants
>   pci: define some AER constants
>   devtools: forbid inclusion of Linux header for PCI
> 
For the rest of the patches I haven't already acked, assume no comments
from me.

Series-acked-by: Bruce Richardson 

Re: [Question/Issue] pkgconfig does not include dpdk/drivers libs

[Bruce Richardson]

On Thu, Aug 03, 2023 at 09:15:11AM +, Abhineet Pandey wrote:
>I’m consuming dpdk via spdk.
>I was trying to use pkg-config for a Makefile that I’m writing,
>Executing:
> 
>PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs --static
>libdpdk
>Output:
>-Wl,--whole-archive -Wl,--no-whole-archive -Wl,--as-needed -pthread
>-L/home/nutanix/exact_spdk/spdk/dpdk/build/lib -l:librte_bus_pci.a
>-l:librte_bus_vdev.a -l:librte_mempool_ring.a -l:librte_vhost.a
>-l:librte_security.a -l:librte_reorder.a -l:librte_power.a
>-l:librte_cryptodev.a -l:librte_compressdev.a -l:librte_timer.a
>-l:librte_hash.a -l:librte_cmdline.a -l:librte_pci.a -l:librte_ethdev.a
>-l:librte_meter.a -l:librte_net.a -l:librte_mbuf.a -l:librte_mempool.a
>-l:librte_rcu.a -l:librte_ring.a -l:librte_eal.a -l:librte_telemetry.a
>-l:librte_kvargs.a -lrte_vhost -lrte_security -lrte_reorder -lrte_power
>-lrte_cryptodev -lrte_compressdev -lrte_timer -lrte_hash -lrte_cmdline
>-lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool
>-lrte_rcu -lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -lm -ldl
>-lnuma
>At a closer look, you’ll see -l:librte_bus_pci.a -l:librte_bus_vdev.a
>-l:librte_mempool_ring.a, but you won’t find corresponding
>-lrte_bus_pci, -lrte_bus_vdev, -lrte_mempool_ring. This showed up in my
>use case as rte_mempool_ring has some functions which execute on
>startup via __attribute__((constructor)), and they did not execute thus
>causing issues.

I think there are two separate issues you are flagging here.
1. Absense of -lrte_bus_pci and similar flags
2. Missing constructor runs.

For the former, the behaviour is exactly as expected. You have specified
static linkage on the pkg-config commandline, so pkg-config is listing out
the libraries to link against only in static form. With
-l:librte_bus_pci.a, where is no need for -lrte_bus_pci since the pci bus
library is already linked in.

For the missing constructors, the issue is separate. That implies that when
the static libs are linked, the constructors are not getting included.
Normally, this is done by specifying the --whole-archive flag to the
linker, but in your case above, that is immediately followed by
--no-whole-archive which counteracts it! I suspect you may have a bug in
your pkg-config. By any chance are you using pkg-config 0.27? There is
known issue with it not linking static libs correctly, see note in [1]

/Bruce

[1] 
https://doc.dpdk.org/guides-23.07/linux_gsg/sys_reqs.html#compilation-of-the-dpdk

Re: [PATCH 03/14] bus/pci: find PCI capability

[David Marchand]

On Thu, Aug 3, 2023 at 11:53 AM Bruce Richardson
 wrote:
>
> On Thu, Aug 03, 2023 at 10:49:54AM +0100, Bruce Richardson wrote:
> > On Thu, Aug 03, 2023 at 09:50:26AM +0200, David Marchand wrote:
> > > Introduce two helpers so that drivers stop reinventing the wheel.
> > > Use it in existing drivers.
> > >
> >
> > Can you give a little more context on the new helpers and the changes in
> > the patch? A lot of the changes are not that self-explanatory.
> >
> Reading through the patch a second time, I get a better idea of what is
> happening, and it looks fine [though still think a little more detail is
> needed in the log]
>
> Acked-by: Bruce Richardson 

Sure, I'll update in v2.


-- 
David Marchand

Re: [PATCH 02/14] bus/pci: add const to some experimental API

[David Marchand]

On Thu, Aug 3, 2023 at 11:47 AM Bruce Richardson
 wrote:
>
> On Thu, Aug 03, 2023 at 09:50:25AM +0200, David Marchand wrote:
> > Those functions are fine with a const on the device pointer.
> >
> > Signed-off-by: David Marchand 
> > ---
> >  drivers/bus/pci/pci_common.c  | 4 ++--
> >  drivers/bus/pci/rte_bus_pci.h | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> > index 52404ab0fe..382b0b8946 100644
> > --- a/drivers/bus/pci/pci_common.c
> > +++ b/drivers/bus/pci/pci_common.c
> > @@ -814,7 +814,7 @@ rte_pci_get_iommu_class(void)
> >  }
> >
> >  off_t
> > -rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap)
> > +rte_pci_find_ext_capability(const struct rte_pci_device *dev, uint32_t cap)
> >  {
> >   off_t offset = RTE_PCI_CFG_SPACE_SIZE;
> >   uint32_t header;
> > @@ -857,7 +857,7 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
> > uint32_t cap)
> >  }
> >
> >  int
> > -rte_pci_set_bus_master(struct rte_pci_device *dev, bool enable)
> > +rte_pci_set_bus_master(const struct rte_pci_device *dev, bool enable)
> >  {
> >   uint16_t old_cmd, cmd;
> >
>
> While generally I'm a big fan of using const everywhere we can, I wonder if
> this is confusing here, since you are changing a setting, i.e. it's not
> a read-only function.

Changing a setting in the underlying hardware, yes, but the C object
is left untouched.


-- 
David Marchand

Re: [PATCH 06/14] pci: define some command constants

[David Marchand]

On Thu, Aug 3, 2023 at 11:58 AM Bruce Richardson
 wrote:
>
> On Thu, Aug 03, 2023 at 09:50:29AM +0200, David Marchand wrote:
> > Define some PCI command constants and use them in existing drivers.
> >
> > Signed-off-by: David Marchand 
> > ---
>
> For the idea, all good, but for the implementation, one comment inline
> below.
>
> With the below reworked:
>
> Acked-by: Bruce Richardson 
>
> >  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_STATUS0x4
> > -#define DLB2_PCI_COMMAND_INTX_DISABLE0x400
> >  #define DLB2_PCI_ACS_CAP 0x4
> >  #define DLB2_PCI_ACS_CTRL0x6
> >  #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_ID0x00/* 16 bits */
> >  #define RTE_PCI_DEVICE_ID0x02/* 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 */
> >
>
> It's weird here to have two defines in the same block with the same value -
> even if one is 0x04 and the other is 0x4. That implies that the two values
> don't belong in the same block of defines.
>
> Question - would enums make sense for defining any of these? It allows
> the groups to be named?

That's something I will look into, or at least better organise the defines..


-- 
David Marchand

RE: [PATCH v5] build: update DPDK to use C11 standard

[Ali Alnubani]

> -Original Message-
> From: Bruce Richardson 
> Sent: Wednesday, August 2, 2023 3:32 PM
> To: dev@dpdk.org
> Cc: Bruce Richardson ; Morten Brørup
> ; Tyler Retzlaff
> 
> Subject: [PATCH v5] build: update DPDK to use C11 standard
> 
> As previously announced, DPDK 23.11 will require a C11 supporting
> compiler and will use the C11 standard in all builds.
> 
> Forcing use of the C standard, rather than the standard with
> GNU extensions, means that some posix definitions which are not in
> the C standard are unavailable by default. We fix this by ensuring
> the correct defines or cflags are passed to the components that
> need them.
> 
> Signed-off-by: Bruce Richardson 
> Acked-by: Morten Brørup 
> Acked-by: Tyler Retzlaff 
> ---
> V5:
> * Fix build issues with bool type in altivec code, due to bool type
>   being in C11. Use __bool for altivec-specific version instead.
> 
> V4:
> * pass cflags to the structure and definition checks in mlx* drivers
>   to ensure posix definitions - as well as C-standard ones - are
>   available.
> 
> V3:
> * remove (now unneeded) use of -std=gnu99 in failsafe net driver.
> 
> V2:
> * Resubmit now that 23.11-rc0 patch applied
> * Add _POSIX_C_SOURCE macro to eal_common_errno.c to get POSIX
>   definition of strerror_r() with c11 standard.
> 
> ---

Tested-by: Ali Alnubani 

Thanks,
Ali

Re: [Question/Issue] pkgconfig does not include dpdk/drivers libs

[Abhineet Pandey]

Hi Bruce,
Thanks for taking a look at this.

Talking about the issues you pointed,
1. Absense of -lrte_bus_pci and similar flags
Even if I don’t give –static flag, I don’t see -lrte_bus_pci (and  
-lrte_bus_vdev, -lrte_mempool_ring).
Attaching output,
PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs libdpdk
-Wl,--as-needed -L/home/nutanix/spdk/dpdk/build/lib -lrte_vhost -lrte_security 
-lrte_reorder -lrte_dmadev -lrte_power -lrte_cryptodev -lrte_compressdev 
-lrte_timer -lrte_hash -lrte_cmdline -lrte_pci -lrte_ethdev -lrte_meter 
-lrte_net -lrte_mbuf -lrte_mempool -lrte_rcu -lrte_ring -lrte_eal 
-lrte_telemetry -lrte_kvargs
Not sure if this is expected.

2. Missing constructor runs.
Got your point. I’m using pkg-config  0.27.1. Will check how to avoid the 
automatic No Whole Archive thing. Still not sure about point 1 though.

Regards,
Abhineet

From: Bruce Richardson 
Date: Thursday, 3 August 2023 at 3:46 PM
To: Abhineet Pandey 
Cc: dev@dpdk.org 
Subject: Re: [Question/Issue] pkgconfig does not include dpdk/drivers libs
On Thu, Aug 03, 2023 at 09:15:11AM +, Abhineet Pandey wrote:
>I’m consuming dpdk via spdk.
>I was trying to use pkg-config for a Makefile that I’m writing,
>Executing:
>
>PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs --static
>libdpdk
>Output:
>-Wl,--whole-archive -Wl,--no-whole-archive -Wl,--as-needed -pthread
>-L/home/nutanix/exact_spdk/spdk/dpdk/build/lib -l:librte_bus_pci.a
>-l:librte_bus_vdev.a -l:librte_mempool_ring.a -l:librte_vhost.a
>-l:librte_security.a -l:librte_reorder.a -l:librte_power.a
>-l:librte_cryptodev.a -l:librte_compressdev.a -l:librte_timer.a
>-l:librte_hash.a -l:librte_cmdline.a -l:librte_pci.a -l:librte_ethdev.a
>-l:librte_meter.a -l:librte_net.a -l:librte_mbuf.a -l:librte_mempool.a
>-l:librte_rcu.a -l:librte_ring.a -l:librte_eal.a -l:librte_telemetry.a
>-l:librte_kvargs.a -lrte_vhost -lrte_security -lrte_reorder -lrte_power
>-lrte_cryptodev -lrte_compressdev -lrte_timer -lrte_hash -lrte_cmdline
>-lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool
>-lrte_rcu -lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -lm -ldl
>-lnuma
>At a closer look, you’ll see -l:librte_bus_pci.a -l:librte_bus_vdev.a
>-l:librte_mempool_ring.a, but you won’t find corresponding
>-lrte_bus_pci, -lrte_bus_vdev, -lrte_mempool_ring. This showed up in my
>use case as rte_mempool_ring has some functions which execute on
>startup via __attribute__((constructor)), and they did not execute thus
>causing issues.

I think there are two separate issues you are flagging here.
1. Absense of -lrte_bus_pci and similar flags
2. Missing constructor runs.

For the former, the behaviour is exactly as expected. You have specified
static linkage on the pkg-config commandline, so pkg-config is listing out
the libraries to link against only in static form. With
-l:librte_bus_pci.a, where is no need for -lrte_bus_pci since the pci bus
library is already linked in.

For the missing constructors, the issue is separate. That implies that when
the static libs are linked, the constructors are not getting included.
Normally, this is done by specifying the --whole-archive flag to the
linker, but in your case above, that is immediately followed by
--no-whole-archive which counteracts it! I suspect you may have a bug in
your pkg-config. By any chance are you using pkg-config 0.27? There is
known issue with it not linking static libs correctly, see note in [1]

/Bruce

[1] 
https://urldefense.proofpoint.com/v2/url?u=https-3A__doc.dpdk.org_guides-2D23.07_linux-5Fgsg_sys-5Freqs.html-23compilation-2Dof-2Dthe-2Ddpdk&d=DwIDaQ&c=s883GpUCOChKOHiocYtGcg&r=UaVZAw32qzYwqV0iyjkICkaNhB8peZhhEJSs22LHVbI&m=NHXDGIxEa3NlLGmshhz7un6SMT4NlACKBYA39xVBj3VGki9GCytR-HAHnQi0cM4S&s=OSlZ0EizFQ8Xa1HkrPrAywHi_kuZHJHhTe48KKtL-AA&e=

Re: [Question/Issue] pkgconfig does not include dpdk/drivers libs

[Bruce Richardson]

On Thu, Aug 03, 2023 at 12:51:36PM +, Abhineet Pandey wrote:
>Hi Bruce,
>Thanks for taking a look at this.
>Talking about the issues you pointed,
>1. Absense of -lrte_bus_pci and similar flags
>Even if I don’t give –static flag, I don’t see -lrte_bus_pci (and
>-lrte_bus_vdev, -lrte_mempool_ring).
>Attaching output,
>PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs libdpdk
> 
>-Wl,--as-needed -L/home/nutanix/spdk/dpdk/build/lib -lrte_vhost
>-lrte_security -lrte_reorder -lrte_dmadev -lrte_power -lrte_cryptodev
>-lrte_compressdev -lrte_timer -lrte_hash -lrte_cmdline -lrte_pci
>-lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_rcu
>-lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs
>Not sure if this is expected.

Yes, that is expected. For shared-library builds, the drivers are
dynamically loaded at runtime, rather than being linked directly to the
app. This allows drivers to be added/removed from an install without
breaking anything. To deploy DPDK to a platform, you only need copy over
the .so files you need for the hardware on that platform.

>2. Missing constructor runs.
>Got your point. I’m using pkg-config  0.27.1. Will check how to avoid
>the automatic No Whole Archive thing. Still not sure about point 1
>though.

I'd recommend installing pkgconf, or getting an updated pkg-config binary.

>Regards,
>Abhineet
> 
> 
>From: Bruce Richardson 
>Date: Thursday, 3 August 2023 at 3:46 PM
>To: Abhineet Pandey 
>Cc: dev@dpdk.org 
>Subject: Re: [Question/Issue] pkgconfig does not include dpdk/drivers
>libs
> 
>On Thu, Aug 03, 2023 at 09:15:11AM +, Abhineet Pandey wrote:
>>I’m consuming dpdk via spdk.
>>I was trying to use pkg-config for a Makefile that I’m writing,
>>Executing:
>>
>>PKG_CONFIG_PATH=dpdk/build/lib/pkgconfig pkg-config --libs
>--static
>>libdpdk
>>Output:
>>-Wl,--whole-archive -Wl,--no-whole-archive -Wl,--as-needed
>-pthread
>>-L/home/nutanix/exact_spdk/spdk/dpdk/build/lib -l:librte_bus_pci.a
>>-l:librte_bus_vdev.a -l:librte_mempool_ring.a -l:librte_vhost.a
>>-l:librte_security.a -l:librte_reorder.a -l:librte_power.a
>>-l:librte_cryptodev.a -l:librte_compressdev.a -l:librte_timer.a
>>-l:librte_hash.a -l:librte_cmdline.a -l:librte_pci.a
>-l:librte_ethdev.a
>>-l:librte_meter.a -l:librte_net.a -l:librte_mbuf.a
>-l:librte_mempool.a
>>-l:librte_rcu.a -l:librte_ring.a -l:librte_eal.a
>-l:librte_telemetry.a
>>-l:librte_kvargs.a -lrte_vhost -lrte_security -lrte_reorder
>-lrte_power
>>-lrte_cryptodev -lrte_compressdev -lrte_timer -lrte_hash
>-lrte_cmdline
>>-lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf
>-lrte_mempool
>>-lrte_rcu -lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -lm
>-ldl
>>-lnuma
>>At a closer look, you’ll see -l:librte_bus_pci.a
>-l:librte_bus_vdev.a
>>-l:librte_mempool_ring.a, but you won’t find corresponding
>>-lrte_bus_pci, -lrte_bus_vdev, -lrte_mempool_ring. This showed up
>in my
>>use case as rte_mempool_ring has some functions which execute on
>>startup via __attribute__((constructor)), and they did not execute
>thus
>>causing issues.
>I think there are two separate issues you are flagging here.
>1. Absense of -lrte_bus_pci and similar flags
>2. Missing constructor runs.
>For the former, the behaviour is exactly as expected. You have
>specified
>static linkage on the pkg-config commandline, so pkg-config is listing
>out
>the libraries to link against only in static form. With
>-l:librte_bus_pci.a, where is no need for -lrte_bus_pci since the pci
>bus
>library is already linked in.
>For the missing constructors, the issue is separate. That implies that
>when
>the static libs are linked, the constructors are not getting included.
>Normally, this is done by specifying the --whole-archive flag to the
>linker, but in your case above, that is immediately followed by
>--no-whole-archive which counteracts it! I suspect you may have a bug
>in
>your pkg-config. By any chance are you using pkg-config 0.27? There is
>known issue with it not linking static libs correctly, see note in [1]
>/Bruce
>[1]
>[1]https://urldefense.proofpoint.com/v2/url?u=https-3A__doc.dpdk.org_gu
>ides-2D23.07_linux-5Fgsg_sys-5Freqs.html-23compilation-2Dof-2Dthe-2Ddpd
>k&d=DwIDaQ&c=s883GpUCOChKOHiocYtGcg&r=UaVZAw32qzYwqV0iyjkICkaNhB8peZhhE
>JSs22LHVbI&m=NHXDGIxEa3NlLGmshhz7un6SMT4NlACKBYA39xVBj3VGki9GCytR-HAHnQ
>i0cM4S&s=OSlZ0EizFQ8Xa1HkrPrAywHi_kuZHJHhTe48KKtL-AA&e=
> 
> References
> 
>1. 
> https://urldefense.proofpoint.com/v2/url?u=https-3A__doc.dpdk.org_guides-2D23.07_linux-5Fgsg_sys-5Freqs.html-23compilation-2Do

[RFC] ethdev: add calcualte hash function

[Ori Kam]

rte_flow supports insert by index table[1].

Using the above table, the application can create rules
that are based on hash.
For example application can create the following logic in order
to create load balancing:
1. Create insert by index table with 2 rules, that hashes based on dmac
2. Insert to index 0 a rule that sends the traffic to port A.
3. Insert to index 1 a rule that sends the traffic to port B.

Let's also assume that before this table, there is a 5 tuple
match table that jumps to the above table.

So each packet that matches one of the 5 tuple rules is RSSed
to port A or B, based on dmac hash.

The issue arises when there is a miss on the 5 tuple table,
which resulted due to the packet being the first packet of this flow, or
fragmented packet or any other reason.
In this case, the application must calculate what would be the
hash calculated by the HW so it can send the packet to the correct
port.

This new API allows applications to calculate the hash value of a given
packet for a given table.

[1] - 
http://patches.dpdk.org/project/dpdk/patch/20230208030624.78465-2-akozy...@nvidia.com/

Signed-off-by: Ori Kam 
---
 lib/ethdev/rte_flow.h | 32 
 1 file changed, 32 insertions(+)

diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 86ed98c562..85a9964437 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -6636,6 +6636,38 @@ rte_flow_async_action_list_handle_query_update(uint16_t 
port_id, uint32_t queue_
  void *user_data,
  struct rte_flow_error *error);
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Calculate the hash for a given pattern in a given table as
+ * calculated by the HW.
+ *
+ * @param port_id
+ *   Port identifier of Ethernet device.
+ * @param table
+ *   The table the SW wishes to simulate.
+ * @param pattern_template_index
+ *   The pattern index in the table to be used for the calculation.
+ * @param pattern
+ *   The values to be used in the hash calculation.
+ * @param hash
+ *   Used to return the calculated hash.
+ * @param error
+ *   Perform verbose error reporting if not NULL.
+ *   PMDs initialize this structure in case of error only.
+ *
+ * @return
+ *   - (0) if success.
+ * - (-ENODEV) if *port_id* invalid.
+ * - (-ENOTSUP) if underlying device does not support this functionality.
+ */
+__rte_experimental
+int
+rte_flow_calc_table_hash(uint16_t port_id, const struct 
rte_flow_template_table *table,
+uint8_t pattern_template_index, const struct 
rte_flow_item pattern[],
+uint32_t *hash, struct rte_flow_error *error);
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.34.1

Re: [PATCH v5] build: update DPDK to use C11 standard

[David Marchand]

On Wed, Aug 2, 2023 at 2:32 PM Bruce Richardson
 wrote:
>
> As previously announced, DPDK 23.11 will require a C11 supporting
> compiler and will use the C11 standard in all builds.
>
> Forcing use of the C standard, rather than the standard with
> GNU extensions, means that some posix definitions which are not in
> the C standard are unavailable by default. We fix this by ensuring
> the correct defines or cflags are passed to the components that
> need them.
>
> Signed-off-by: Bruce Richardson 
> Acked-by: Morten Brørup 
> Acked-by: Tyler Retzlaff 
Tested-by: Ali Alnubani 

The CI results look good.

Applied, thanks!


-- 
David Marchand

RE: [PATCH] ethdev: introduce generic flow item and action

[Morten Brørup]

> From: Zhang, Qi Z [mailto:qi.z.zh...@intel.com]
> Sent: Thursday, 3 August 2023 03.05
> 
> > From: Morten Brørup 
> > Sent: Thursday, August 3, 2023 1:56 AM
> >
> > > From: Dumitrescu, Cristian [mailto:cristian.dumitre...@intel.com]
> > > Sent: Wednesday, 2 August 2023 19.23
> > >
> > > > From: Ori Kam 
> > > > Sent: Wednesday, August 2, 2023 5:06 PM
> > > >
> > > > Hi Qi,
> > > >
> > > > In addition to my previous email,
> > > > I fully support you’re your idea to update the rte_flow API so it
> > > > will be easier for P4 integration, I just think the suggested
> > > approach is not
> > > > the correct one at least not as appears in the RFC.
> > > >
> > > > I think it will be good if we can discuss some uses cases you are
> > > having
> > > > with the API/implementation and see what is the best way to solve
> > > them.
> > > > The main idea is not to re-invent the wheel, but to solve issues.
> > >
> > > Yes, fully agree, it would be great meet and talk through this, as we
> > > did it in the past for other issues. What days & time next week would
> > > be good for people?
> >
> > My calendar is pretty much all open these days, so anytime work hours in the
> > Central European time zone works for me.
> >
> > >
> > > Meanwhile, some answers below.
> > >
> > > >
> > > > To summarize, as I see it there are several issues:
> > > > 1. no protocol is defined so different PMD can't translate it.
> > >
> > > The format of the flow items is defined by the P4 program, so all the
> > > HW devices (from the same or from different vendors) that are able to
> > > successfully load the given P4 program will have the same
> > > understanding of the flow items.
> >
> > If the P4 flow items/actions are standardized by some P4 organization or
> > similar, they can be enumerated and defined as DPDK flow items/actions. At
> > least the ones that are standardized.
> >
> > And if you (for flexibility or other reasons) need to bypass the RTE_FLOW
> > standardization process (getting ACKs etc. on the DPDK mailing list) for
> faster
> > integration of new DPDK flow items/actions, it does make sense to define a
> > generic flow item (and action) for this purpose (and not just for P4).
> 
> >
> > In order to avoid conflicts between P4 and non-P4 generic flow
> items/actions,
> > the generic type should include information about how to interpret the
> > information, which is why I suggest making it a Vendor-Specific type, with
> > vendor-specific TLV's (managed by the vendor), like the RADIUS Vendor-
> > Specific attributes I compared to, instead of just an opaque blob.
> 
> I like this idea, but it is not necessary to introduce a vendor-specific type,
> it could be considered a device-specific type (or port-specific in the context
> of DPDK).
> 
> However, the PMD can manage a dictionary, enabling users to query about the
> format of each generic item or action if we can expose a set of query APIs.
> 
> But I guess we don't need vendor-id / vendor-type as RADIUS does, as we have
> port_id here.

If the flow item itself doesn't have a "type" field (identifying how to 
interpret the blob), you might have two different NICs using each their own 
blob format. The NIC must be able to determine if a given flow item is of a 
type it can understand, before it tries to parse the blob in it.

This is why the "struct rte_flow_item" has a "type" field. It tells the HW how 
to interpret the values in a flow item.

If we introduce a "generic" flow item type, it can only be used for multiple 
purposes (i.e. both P4, but also other purposes than P4) if it has a "sub-type" 
field. Otherwise, someone will create a "generic" flow item containing a P4 
program and send it to a NIC, which uses the "generic" flow item type for other 
program types, e.g. a cBPF program. And this cBPF capable NIC has no way to 
detect that the blob in the flow item is not a cBPF program, but a P4 program. 
The P4 capable NIC will accept the P4 program, but will be confused when sent 
the cBPF program understood by the first NIC.

So I am suggesting that the "generic" flow items and actions follow an existing 
and well known design patterns for how to identify the meaning of blobs: 
Include a Vendor-ID followed by vendor-specific TLV formatted data.

As I wrote initially, I am opposed to introducing uninterpretable blobs into 
DPDK. Flow items/actions need to be well defined. Allowing "Vendor-Specific" 
flow items/actions is a workaround that allows you to bypass the normal 
standardization process.

> 
> 
> >
> > The P4 standardized items/actions can use the Vendor ID of the P4 standards
> > organization.
> >
> > The non-standardized items/actions can use the Vendor ID of the hardware
> > vendor or the application developer.
> >
> > >
> > > > 2. even the same PMD doesn't know what is the action, unless you
> > > > plan
> > > that
> > > > this will move
> > > > directly to the HW, in this case, the action will be HW dependent.
> > >
> > > The processing of each flow actio

RE: [PATCH] eal: remove RTE_FUNC_PTR_* deprecated macros

[Morten Brørup]

> From: David Marchand [mailto:david.march...@redhat.com]
> Sent: Thursday, 3 August 2023 11.41
> 
> The RTE_FUNC_PTR_OR_* macros were marked as deprecated in v22.11, we can
> remove them.
> 
> Signed-off-by: David Marchand 
> ---

Acked-by: Morten Brørup 

Re: [PATCH] eal: remove RTE_FUNC_PTR_* deprecated macros

[Tyler Retzlaff]

On Thu, Aug 03, 2023 at 11:41:18AM +0200, David Marchand wrote:
> The RTE_FUNC_PTR_OR_* macros were marked as deprecated in v22.11, we can
> remove them.
> 
> Signed-off-by: David Marchand 
> ---
Acked-by: Tyler Retzlaff 

[PATCH] gpu/cuda: fix getenv related build error

[Levend Sayar]

If gdrapi.h is available, meson sets DRIVERS_GPU_CUDA_GDRCOPY_H as 1.
This causes gdrcopy.c build to give an error;
because compiler can not find signature of getenv.
stdlib.h is included for the definition of getenv function.

Fixes: ca12f5e8a7db ("gpu/cuda: mark unused GDRCopy functions parameters")

Signed-off-by: Levend Sayar 
---
 drivers/gpu/cuda/gdrcopy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/cuda/gdrcopy.c b/drivers/gpu/cuda/gdrcopy.c
index 322a5dbeb2..bd56b73ce4 100644
--- a/drivers/gpu/cuda/gdrcopy.c
+++ b/drivers/gpu/cuda/gdrcopy.c
@@ -6,6 +6,8 @@
 
 #ifdef DRIVERS_GPU_CUDA_GDRCOPY_H
 
+#include 
+
 static void *gdrclib;
 static gdr_t (*sym_gdr_open)(void);
 static int (*sym_gdr_pin_buffer)(gdr_t g, unsigned long addr, size_t size,
-- 
2.39.2 (Apple Git-143)

Re: Drivers, architectures, processor families, etc.

[Philip Prindeville]

> On Aug 2, 2023, at 4:47 PM, Stephen Hemminger  
> wrote:
> 
> On Wed, 2 Aug 2023 15:49:54 -0600
> Philip Prindeville  wrote:
> 
>> Hi,
>> 
>> I'm trying to come up with some Kconfig logic for OpenWRT packaging to help 
>> users select the right build options for their hardware.
>> 
>> Most OpenWRT developers typically cross-compile, so we obviously can't rely 
>> on detection on the build host as that's rarely the same as the target 
>> machine.
>> 
>> Looking in the DPDK repo, I don't see any description of the available 
>> architectures, drivers, etc. and what I had seen previously was (if I 
>> remember) only for x86_64 hardware, and even that I can't seem to locate 
>> again.
>> 
>> Would it make sense to put some of these definitions into the repo itself, 
>> so that when new drivers are added, that stands out (at least in the commit 
>> logs) and we can capture the permutations of what driver goes with which SoC 
>> on what architecture, etc?
>> 
>> Thanks,
>> 
>> -Philip
>> 
> 
> DPDK now uses meson which by default builds everything available on the build 
> architecture.
> There is intentionally no way to disable drivers, you can disable some 
> libraries though.



The issue I'm trying to resolve is that if you're building for SoC Xyzzy that 
includes an on-chip NIC, then that driver should *only* ever be selectable when 
building for that SoC.

There's no point if generating (or packaging) combinations of platform + driver 
that aren't viable.

Are you suggesting that we just select the architecture, and let the available 
drivers fall out of that?

Re: [PATCH v2] doc: build manpages as well as html output

[Bruce Richardson]

On Thu, Aug 03, 2023 at 11:18:09AM +0200, David Marchand wrote:
> On Mon, Jul 17, 2023 at 1:09 PM Bruce Richardson
>  wrote:
> > > There may be some polishing to do later.
> > > Looking at the result for rte_eal_init, I see that the generated
> > > manual starts with a reference to the rte_eal.h header with a path
> > > relative to its location in the DPDK tree.
> > > $ MANPATH=build-gcc/install/share/man man rte_eal_init | head -5
> > > lib/eal/include/rte_eal.h(3)
> > >DPDK
> > >
> > > lib/eal/include/rte_eal.h(3)
> > >
> > > NAME
> > >lib/eal/include/rte_eal.h
> > >
> > > At least, it is possible to ask for this header man with "man
> > > rte_eal.h", but it is a bit confusing.
> > > Is there something we can do on this side?
> > >
> >
> > Not sure, not really familiar with how doxygen works generating manpages
> > and the options supported, etc. etc. Mainly I just looked at the
> > build-system side to support this, since I really missed having manpages
> > for DPDK functions to quickly check parameter order.
> 
> doxygen is invoked on the sources tree, so this is probably the reason
> why such path is in the generated manual.
> Maybe Thomas has an idea how we could handle this.
> 
> In any case, I am fine with this patch as it is now.
>
I think I've found a fix for this.
doxygen setting "FULL_PATH_NAMES" defaults to "YES", which is what we want
for the HTML pages. However, setting it to "NO", I believe is correct for
generating the manpages.

Patch V3 on its way.

/Bruce 

[PATCH v3] doc: build manpages as well as html output

[Bruce Richardson]

Doxygen can produce manpage output as well as html output for the DPDK
APIs. However, we need to do this as a separate task as the manpage
output needs to be placed in a different location post-install to the
html output (/usr/local/share/man vs /usr/local/share/doc/).

Changes required are:
* Add configurable options for manpage output and html output to the
  doxygen config template. (Remove option for html output path as it's
  always "html")
* Modify API meson.build file to configure two separate doxygen config
  files, for HTML and manpages respectively.
* Change doxygen wrapper script to have separate output log files for
  the manpage and HTML jobs, to avoid conflicts
* Add "custom_targets" to meson.build file to build the HTML pages and
  the manpages, with individual install locations for each.
* Where supported by meson version, call "mandb" post-install to update
  the man database to ensure the new manpages can be found.

Signed-off-by: Bruce Richardson 
Reviewed-by: David Marchand 

---

V3: don't use full file paths when generating manpages

V2: add doc update about building or using the manpages
---
 doc/api/doxy-api.conf.in  |  8 ++--
 doc/api/generate_doxygen.py   |  2 +-
 doc/api/meson.build   | 54 +++
 doc/guides/contributing/documentation.rst | 12 -
 4 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 1a4210b948..c77bdb328b 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -124,11 +124,13 @@ EXAMPLE_PATTERNS= *.c
 EXAMPLE_RECURSIVE   = YES
 
 OUTPUT_DIRECTORY= @OUTPUT@
+FULL_PATH_NAMES = @FULL_PATH_NAMES@
 STRIP_FROM_PATH = @STRIP_FROM_PATH@
-GENERATE_HTML   = YES
-HTML_OUTPUT = @HTML_OUTPUT@
+GENERATE_HTML   = @GENERATE_HTML@
+HTML_OUTPUT = html
 GENERATE_LATEX  = NO
-GENERATE_MAN= NO
+GENERATE_MAN= @GENERATE_MAN@
+MAN_LINKS   = YES
 
 HAVE_DOT= NO
 
diff --git a/doc/api/generate_doxygen.py b/doc/api/generate_doxygen.py
index d3a22869f6..c704f13018 100755
--- a/doc/api/generate_doxygen.py
+++ b/doc/api/generate_doxygen.py
@@ -7,7 +7,7 @@
 
 pattern = re.compile('^Preprocessing (.*)...$')
 out_dir, *doxygen_command = sys.argv[1:]
-out_file = os.path.join(os.path.dirname(out_dir), 'doxygen.out')
+out_file = os.path.join(out_dir + '.out')
 dep_file = f'{out_dir}.d'
 with open(out_file, 'w') as out:
 subprocess.run(doxygen_command, check=True, stdout=out)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 2876a78a7e..9f83b34bb3 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -29,11 +29,11 @@ example = custom_target('examples.dox',
 install_dir: htmldir,
 build_by_default: get_option('enable_docs'))
 
+#set up common doxygen configuration
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
 cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', 
'examples.dox'))
 cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api'))
-cdata.set('HTML_OUTPUT', 'html')
 cdata.set('TOPDIR', dpdk_source_root)
 cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, 
join_paths(dpdk_build_root, 'doc', 'api')]))
 cdata.set('WARN_AS_ERROR', 'NO')
@@ -41,14 +41,33 @@ if get_option('werror')
 cdata.set('WARN_AS_ERROR', 'YES')
 endif
 
-doxy_conf = configure_file(input: 'doxy-api.conf.in',
-output: 'doxy-api.conf',
-configuration: cdata)
+# configure HTML doxygen run
+html_cdata = configuration_data()
+html_cdata.merge_from(cdata)
+html_cdata.set('GENERATE_HTML', 'YES')
+html_cdata.set('GENERATE_MAN', 'NO')
+html_cdata.set('FULL_PATH_NAMES', 'YES')
 
-doxy_build = custom_target('doxygen',
+doxy_html_conf = configure_file(input: 'doxy-api.conf.in',
+output: 'doxy-api-html.conf',
+configuration: html_cdata)
+
+# configure manpage doxygen run
+man_cdata = configuration_data()
+man_cdata.merge_from(cdata)
+man_cdata.set('GENERATE_HTML', 'NO')
+man_cdata.set('GENERATE_MAN', 'YES')
+man_cdata.set('FULL_PATH_NAMES', 'NO')
+
+doxy_man_conf = configure_file(input: 'doxy-api.conf.in',
+output: 'doxy-api-man.conf',
+configuration: man_cdata)
+
+# do doxygen runs
+doxy_html_build = custom_target('doxygen-html',
 depends: example,
 depend_files: 'doxy-api-index.md',
-input: doxy_conf,
+input: doxy_html_conf,
 output: 'html',
 depfile: 'html.d',
 command: [generate_doxygen, '@OUTPUT@', doxygen, '@INPUT@'],
@@ -56,5 +75,24 @@ doxy_build = custom_target('doxygen',
 install_dir: htmldir,
 build_by_default: get_option('enable_docs'))
 
-doc_targets += doxy_build
-doc_target_names += 'Doxygen_API'
+doc_targets += doxy_html_build
+doc_target_names += 'Doxygen_API(HTML)'
+
+doxy_man_build = custom_target('doxygen-man',
+dep

RE: [PATCH v1] event/dlb2: add support for disabling PASID

[Sevincer, Abdullah]

>+Is anybody looking into reworking this proposal and moving this code to the 
>pci bus driver?
>+Cc: pci bus maintainers.


>+--
>+David Marchand

We will work on this proposal, it is not finalized yet.
Its not DLB2 specific as commenters say, we are looking into if there is 
another way doing it.
If it will end up common and not DLB specific for other drivers as well we will 
add function to pci common. 

RE: [PATCH v1] examples/l3fwd: relax the RSS/Offload requirement

[Trevor Tao]

HI Konstantin:

I do understand your requirement on the SW support for the IPV4 cksum 
verification, and I think it really can be added here later some time when 
missing HW support.
Anyway, there is a "warning:" message had been sent out to notify the user 
there is a lack of HW capability support for packets, and it would enable this 
missing case can run smoothly for some urgent users which really exist with our 
experiences.
On the other side, maybe another hint of "warning: no HW check for IPv4 
checksum" or something alike could be helpful to users before the SW support 
added. 

Thanks,

Best Regards,
 
Zijin Tao(Trevor Tao, 陶孜谨)
ARM Electronic Technology (Shanghai) Co., Ltd
安谋电子科技（上海）有限公司
Building 11, Shanghai Busininess ParkⅢ ,
No.1016 Tianlin Rd, Minhang District, Shanghai, 200233 China
上海市闵行区田林路1016号科技绿洲三期2号楼10楼，200233
Cell:      +86-153 7109 6192

-Original Message-
From: Konstantin Ananyev  
Sent: Friday, July 28, 2023 4:03 PM
To: Trevor Tao ; tho...@monjalon.net
Cc: dev@dpdk.org; nd ; sta...@dpdk.org; Ruifeng Wang 
; Feifei Wang 
Subject: RE: [PATCH v1] examples/l3fwd: relax the RSS/Offload requirement



> Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS, and offload 
> mode set to RTE_ETH_RX_OFFLOAD_CHECKSUM by default, but some hardware 
> and/or virtual interface does not support the RSS and offload mode 
> presupposed, e.g., some virtio interfaces in the cloud don't support 
> RSS and may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/ 
> RTE_ETH_RX_OFFLOAD_TCP_CKSUM, but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, 
> and the error msg here:

Well, these HW offloads are there for the good reason - l3fwd app relies on 
these HW features to provide functionality requested.
It relies on RTE_ETH_RX_OFFLOAD_IPV4_CKSUM to avoid checks of ip cksum in SW:
static inline int
is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len) {
/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
/*
 * 1. The packet length reported by the Link Layer must be large
 * enough to hold the minimum length legal IP datagram (20 bytes).
 */
if (link_len < sizeof(struct rte_ipv4_hdr))
return -1;

/* 2. The IP checksum must be correct. */
/* this is checked in H/W */ 


By having RSS enabled it ensures that packets from the same 'flow' will be 
processed and send out in order. Probably not a strict requirement for l3fwd 
itself, but definitely nice to have feature that majority of DPDK customers are 
interested in.
I do understand your desire to lower HW requirements for l3fwd, but then 
probably shouldn't be just blind disable, but instead add SW support for them 
when essential HW feature is missing. 

Konstantin
 
> virtio_dev_configure(): RSS support requested but not supported by the 
> device
> Port0 dev_configure = -95
> 
> and:
> Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads 
> capabilities 0x201d in rte_eth_dev_configure()
> 
> So to enable the l3fwd running in that environment, the Rx mode 
> requirement can be relaxed to reflect the hardware feature reality 
> here, and the l3fwd can run smoothly then.
> A warning msg would be provided to user in case it happens here.
> 
> Fixes: af75078fece3 ("first public release")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Trevor Tao 
> Reviewed-by: Ruifeng Wang 
> Reviewed-by: Feifei Wang 
> ---
>  .mailmap  |  1 +
>  examples/l3fwd/main.c | 19 ++-
>  2 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/.mailmap b/.mailmap
> index 8e3940a253..602d8cbc6b 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -1403,6 +1403,7 @@ Tom Rix   Tone Zhang 
>   Tonghao Zhang  
>   Tony Nguyen 
> +Trevor Tao 
>  Tsotne Chakhvadze   Tudor Brindus 
>   Tudor Cornea  
>  diff --git a/examples/l3fwd/main.c 
> b/examples/l3fwd/main.c index a4f061537e..cec87d95d1 100644
> --- a/examples/l3fwd/main.c
> +++ b/examples/l3fwd/main.c
> @@ -1233,8 +1233,12 @@ l3fwd_poll_resource_setup(void)
>   local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
>   dev_info.flow_type_rss_offloads;
> 
> - if (dev_info.max_rx_queues == 1)
> + /* relax the rx rss requirement */
> + if (dev_info.max_rx_queues == 1 || 
> !local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
> + printf("warning: modified the rx mq_mode to 
> RTE_ETH_MQ_RX_NONE base on"
> + " device capability\n");
>   local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
> + }
> 
>   if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
>   port_conf.rx_adv_conf.rss_conf.rss_hf) { @@ 
> -1245,6 +1249,19 @@ 
> l3fwd_poll_resource_setup(void)
>   local_port_conf.rx_adv_conf.rss_conf.rss_hf);
>   }
> 
> + /* relax the rx offload requirement */
> + 

Re: [PATCH v4] eal: non-temporal memcpy

[Mattias Rönnblom]

On 2023-07-31 14:25, Morten Brørup wrote:

From: Thomas Monjalon [mailto:tho...@monjalon.net]
Sent: Monday, 31 July 2023 14.14

Hello,

What's the status of this feature?


I haven't given up on upstreaming this feature, but there doesn't seem to be 
much demand for it, so working on it has low priority.



This would definitely be a useful addition to the EAL, IMO.

It's also a case where it's difficult to provide a generic and portable 
solution with both good performance and reasonable semantics. The upside 
is you seem to come pretty far already.





10/10/2022 08:46, Morten Brørup:

This patch provides a function for memory copy using non-temporal store,
load or both, controlled by flags passed to the function.

Applications sometimes copy data to another memory location, which is only
used much later.
In this case, it is inefficient to pollute the data cache with the copied
data.

An example use case (originating from a real life application):
Copying filtered packets, or the first part of them, into a capture buffer
for offline analysis.

The purpose of the function is to achieve a performance gain by not
polluting the cache when copying data.
Although the throughput can be improved by further optimization, I do not
have time to do it now.

The functional tests and performance tests for memory copy have been
expanded to include non-temporal copying.

A non-temporal version of the mbuf library's function to create a full
copy of a given packet mbuf is provided.

The packet capture and packet dump libraries have been updated to use
non-temporal memory copy of the packets.

Implementation notes:

Implementations for non-x86 architectures can be provided by anyone at a
later time. I am not going to do it.

x86 non-temporal load instructions must be 16 byte aligned [1], and
non-temporal store instructions must be 4, 8 or 16 byte aligned [2].

ARM non-temporal load and store instructions seem to require 4 byte
alignment [3].

[1] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/
index.html#text=_mm_stream_load
[2] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/
index.html#text=_mm_stream_si
[3] https://developer.arm.com/documentation/100076/0100/
A64-Instruction-Set-Reference/A64-Floating-point-Instructions/
LDNP--SIMD-and-FP-

This patch is a major rewrite from the RFC v3, so no version log comparing
to the RFC is provided.

v4
* Also ignore the warning for clang int the workaround for
   _mm_stream_load_si128() missing const in the parameter.
* Add missing C linkage specifier in rte_memcpy.h.

v3
* _mm_stream_si64() is not supported on 32-bit x86 architecture, so only
   use it on 64-bit x86 architecture.
* CLANG warns that _mm_stream_load_si128_const() and
   rte_memcpy_nt_15_or_less_s16a() are not public,
   so remove __rte_internal from them. It also affects the documentation
   for the functions, so the fix can't be limited to CLANG.
* Use __rte_experimental instead of __rte_internal.
* Replace  with nnn in function documentation; it doesn't look like
   HTML.
* Slightly modify the workaround for _mm_stream_load_si128() missing const
   in the parameter; the ancient GCC 4.5.8 in RHEL7 doesn't understand
   #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers", so use
   #pragma GCC diagnostic ignored "-Wcast-qual" instead. I hope that works.
* Fixed one coding style issue missed in v2.

v2
* The last 16 byte block of data, incl. any trailing bytes, were not
   copied from the source memory area in rte_memcpy_nt_buf().
* Fix many coding style issues.
* Add some missing header files.
* Fix build time warning for non-x86 architectures by using a different
   method to mark the flags parameter unused.
* CLANG doesn't understand RTE_BUILD_BUG_ON(!__builtin_constant_p(flags)),
   so omit it when using CLANG.

Signed-off-by: Morten Brørup 
---
  app/test/test_memcpy.c   |   65 +-
  app/test/test_memcpy_perf.c  |  187 ++--
  lib/eal/include/generic/rte_memcpy.h |  127 +++
  lib/eal/x86/include/rte_memcpy.h | 1238 ++
  lib/mbuf/rte_mbuf.c  |   77 ++
  lib/mbuf/rte_mbuf.h  |   32 +
  lib/mbuf/version.map |1 +
  lib/pcapng/rte_pcapng.c  |3 +-
  lib/pdump/rte_pdump.c|6 +-
  9 files changed, 1645 insertions(+), 91 deletions(-)