community/dpdk: upgrade to 23.11

* https://doc.dpdk.org/guides/rel_notes/release_23_11.html
This commit is contained in:
Duncan Bellamy 2023-11-28 20:34:45 +00:00 committed by omni
parent e494d040b3
commit 7d466dbf58
2 changed files with 33 additions and 91 deletions

View File

@ -1,9 +1,9 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=dpdk
pkgver=23.07
pkgrel=4
_majorver=${pkgver%%.*}
# so name version may be different from version, include major bumps
pkgver=23.11
pkgrel=0
pkgdesc="Data Plane Development Kit"
url="https://dpdk.org/"
# s390x, riscv64 is not supported, 32bit not supported
@ -58,6 +58,7 @@ _libs="
common_idpf
common_mlx5
common_octeontx
common_nfp
common_qat
compress_isal
compress_mlx5
@ -96,6 +97,7 @@ _libs="
event_skeleton
event_sw
eventdev
dispatcher
fib
gpudev
graph
@ -107,6 +109,7 @@ _libs="
jobstats
kvargs
latencystats
log
lpm
mbuf
member
@ -204,6 +207,7 @@ _libs="
timer
vdpa_ifc
vdpa_mlx5
vdpa_nfp
vhost
"
_x86_64_libs="
@ -273,14 +277,15 @@ splitlib() {
local libname="${subpkgname#"$pkgname"-}"
libname=${libname//-/_}
local _real=$(readlink "$pkgdir"/usr/lib/librte_$libname.so.$_majorver)
if echo $_real | grep -q pmds; then
amove usr/lib/$_real*
fi
amove usr/lib/librte_$libname.so.*
cd "$pkgdir"
local _f
find . -name "librte_$libname.so.*" | while read -r _f
do
amove "$_f"
done
}
sha512sums="
4859469efe2cc744bddb25ec27efb164f2e4979cce2ffc049566e40e0e6fc797c9c87aeec67ef81293dda0268a97da700ebcdd8110f9d578cb723145c2c0cff7 dpdk-23.07.tar.xz
be6c61ff8b29317e3948bd98e75f08aaf58cded700b18bccef4c77ca68b22906f70b80e57dc203beb45a07e197872b41762b858f674563d752bd73d7f6d53d5a lfs64.patch
e5177d658fca8df55090a92ea1a8932aac5847314fed7c686b8a36e709f34b14c05e68d6c4c433ff5371b67a39c4324b4eefab8c138f417468f57092bf269b4c dpdk-23.11.tar.xz
996a0f0a70ff3d467fc32b3470ab40576d8076a28ff6cb5fa00747fa92d8e068af5d33382c6bee103f30eb217bfb5e4f2d325047633cd1a25481b9436263a82e lfs64.patch
"

View File

@ -1,8 +1,7 @@
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index e634de8..a35c413 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -81,7 +81,7 @@ pci_vfio_read_config(const struct rte_pci_device *dev,
diff -Nurp a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
--- a/drivers/bus/pci/linux/pci_vfio.c 2023-11-28 14:35:41.000000000 +0000
+++ b/drivers/bus/pci/linux/pci_vfio.c 2023-11-28 20:38:26.022187702 +0000
@@ -80,7 +80,7 @@ pci_vfio_read_config(const struct rte_pc
if ((uint64_t)len + offs > size)
return -1;
@ -11,7 +10,7 @@ index e634de8..a35c413 100644
}
int
@@ -102,7 +102,7 @@ pci_vfio_write_config(const struct rte_pci_device *dev,
@@ -101,7 +101,7 @@ pci_vfio_write_config(const struct rte_p
if ((uint64_t)len + offs > size)
return -1;
@ -20,96 +19,34 @@ index e634de8..a35c413 100644
}
/* get PCI BAR number where MSI-X interrupts are */
@@ -123,7 +123,7 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev, int fd,
}
/* read PCI capability pointer from config space */
- ret = pread64(fd, &reg, sizeof(reg), offset + PCI_CAPABILITY_LIST);
+ ret = pread(fd, &reg, sizeof(reg), offset + PCI_CAPABILITY_LIST);
if (ret != sizeof(reg)) {
RTE_LOG(ERR, EAL,
"Cannot read capability pointer from PCI config space!\n");
@@ -136,7 +136,7 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev, int fd,
while (cap_offset) {
/* read PCI capability ID */
- ret = pread64(fd, &reg, sizeof(reg), offset + cap_offset);
+ ret = pread(fd, &reg, sizeof(reg), offset + cap_offset);
if (ret != sizeof(reg)) {
RTE_LOG(ERR, EAL,
"Cannot read capability ID from PCI config space!\n");
@@ -148,7 +148,7 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev, int fd,
/* if we haven't reached MSI-X, check next capability */
if (cap_id != PCI_CAP_ID_MSIX) {
- ret = pread64(fd, &reg, sizeof(reg), offset + cap_offset);
+ ret = pread(fd, &reg, sizeof(reg), offset + cap_offset);
if (ret != sizeof(reg)) {
RTE_LOG(ERR, EAL,
"Cannot read capability pointer from PCI config space!\n");
@@ -163,14 +163,14 @@ pci_vfio_get_msix_bar(const struct rte_pci_device *dev, int fd,
/* else, read table offset */
else {
/* table offset resides in the next 4 bytes */
- ret = pread64(fd, &reg, sizeof(reg), offset + cap_offset + 4);
+ ret = pread(fd, &reg, 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);
+ ret = pread(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");
@@ -202,7 +202,7 @@ pci_vfio_enable_bus_memory(struct rte_pci_device *dev, int dev_fd)
@@ -155,7 +155,7 @@ pci_vfio_enable_bus_memory(struct rte_pc
return -1;
}
- ret = pread64(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
+ ret = pread(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
- ret = pread64(dev_fd, &cmd, sizeof(cmd), offset + RTE_PCI_COMMAND);
+ ret = pread(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");
@@ -213,7 +213,7 @@ pci_vfio_enable_bus_memory(struct rte_pci_device *dev, int dev_fd)
@@ -166,7 +166,7 @@ pci_vfio_enable_bus_memory(struct rte_pc
return 0;
cmd |= PCI_COMMAND_MEMORY;
- ret = pwrite64(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
+ ret = pwrite(dev_fd, &cmd, sizeof(cmd), offset + PCI_COMMAND);
cmd |= RTE_PCI_COMMAND_MEMORY;
- ret = pwrite64(dev_fd, &cmd, sizeof(cmd), offset + RTE_PCI_COMMAND);
+ ret = pwrite(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");
@@ -237,7 +237,7 @@ pci_vfio_set_bus_master(const struct rte_pci_device *dev, int dev_fd, bool op)
return -1;
}
- ret = pread64(dev_fd, &reg, sizeof(reg), offset + PCI_COMMAND);
+ ret = pread(dev_fd, &reg, sizeof(reg), offset + PCI_COMMAND);
if (ret != sizeof(reg)) {
RTE_LOG(ERR, EAL, "Cannot read command from PCI config space!\n");
return -1;
@@ -249,7 +249,7 @@ pci_vfio_set_bus_master(const struct rte_pci_device *dev, int dev_fd, bool op)
else
reg &= ~(PCI_COMMAND_MASTER);
- ret = pwrite64(dev_fd, &reg, sizeof(reg), offset + PCI_COMMAND);
+ ret = pwrite(dev_fd, &reg, sizeof(reg), offset + PCI_COMMAND);
if (ret != sizeof(reg)) {
RTE_LOG(ERR, EAL, "Cannot write command to PCI config space!\n");
@@ -511,7 +511,7 @@ pci_vfio_is_ioport_bar(const struct rte_pci_device *dev, int vfio_dev_fd,
@@ -425,7 +425,7 @@ pci_vfio_is_ioport_bar(const struct rte_
return -1;
}
- ret = pread64(vfio_dev_fd, &ioport_bar, sizeof(ioport_bar),
+ ret = pread(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",
@@ -1334,7 +1334,7 @@ pci_vfio_ioport_read(struct rte_pci_ioport *p,
@@ -1250,7 +1250,7 @@ pci_vfio_ioport_read(struct rte_pci_iopo
if (vfio_dev_fd < 0)
return;
@ -118,7 +55,7 @@ index e634de8..a35c413 100644
len, p->base + offset) <= 0)
RTE_LOG(ERR, EAL,
"Can't read from PCI bar (%" PRIu64 ") : offset (%x)\n",
@@ -1351,7 +1351,7 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p,
@@ -1267,7 +1267,7 @@ pci_vfio_ioport_write(struct rte_pci_iop
if (vfio_dev_fd < 0)
return;
@ -127,7 +64,7 @@ index e634de8..a35c413 100644
len, p->base + offset) <= 0)
RTE_LOG(ERR, EAL,
"Can't write to PCI bar (%" PRIu64 ") : offset (%x)\n",
@@ -1382,7 +1382,7 @@ pci_vfio_mmio_read(const struct rte_pci_device *dev, int bar,
@@ -1298,7 +1298,7 @@ pci_vfio_mmio_read(const struct rte_pci_
if ((uint64_t)len + offs > size)
return -1;
@ -136,7 +73,7 @@ index e634de8..a35c413 100644
}
int
@@ -1402,7 +1402,7 @@ pci_vfio_mmio_write(const struct rte_pci_device *dev, int bar,
@@ -1318,7 +1318,7 @@ pci_vfio_mmio_write(const struct rte_pci
if ((uint64_t)len + offs > size)
return -1;