Skip to content
Snippets Groups Projects
Commit 6e20de31 authored by Duncan Bellamy's avatar Duncan Bellamy :speech_balloon: Committed by Patrycja Rosa
Browse files

community/dpdk: upgrade to 24.07

parent 64f36627
No related branches found
No related tags found
1 merge request!70091community/dpdk: upgrade to 24.07
......@@ -2,12 +2,13 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=dpdk
# so name version may be different from version, includes major bumps of either
pkgver=24.03
pkgrel=1
pkgver=24.07
pkgrel=0
pkgdesc="Data Plane Development Kit"
url="https://dpdk.org/"
# s390x is not supported, 32bit not supported
arch="aarch64 loongarch64 ppc64le riscv64 x86_64"
# loongarch64 currently broken
arch="aarch64 ppc64le riscv64 x86_64"
license="BSD-3-Clause AND GPL-2.0-only"
makedepends="
bsd-compat-headers
......@@ -26,8 +27,7 @@ makedepends="
"
subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
source="https://fast.dpdk.org/rel/dpdk-$pkgver.tar.xz
lfs64.patch
"
ppc.patch"
# at least half tests fail on each platform
options="!check"
......@@ -302,6 +302,6 @@ splitlib() {
}
sha512sums="
fb9633eb8727f47141578f96b0ec5aa1209e6e8ba39ce82a7b07cdba5776b4b2f9bd40f29667b006dcf35c6bf27e309e2b50e6734cb32c52da58bc9c6beadcae dpdk-24.03.tar.xz
996a0f0a70ff3d467fc32b3470ab40576d8076a28ff6cb5fa00747fa92d8e068af5d33382c6bee103f30eb217bfb5e4f2d325047633cd1a25481b9436263a82e lfs64.patch
380b3dde24249118c366b71f140a262985a94e26827e21d2fbdb52fabb3199a93dcb3dc3398a05823991098b3890bd52d9fd803626c7d9645d97be699cb89622 dpdk-24.07.tar.xz
8499daf14b4a174d2d760da9509374e35261dd2f920aec630f5d784109c387ab9331178a150b1b52564d417375db395b2eda3a731d7b408f10a35ee507b2701d ppc.patch
"
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;
- return pread64(fd, buf, len, offset + offs);
+ return pread(fd, buf, len, offset + offs);
}
int
@@ -101,7 +101,7 @@ pci_vfio_write_config(const struct rte_p
if ((uint64_t)len + offs > size)
return -1;
- return pwrite64(fd, buf, len, offset + offs);
+ return pwrite(fd, buf, len, offset + offs);
}
/* get PCI BAR number where MSI-X interrupts are */
@@ -155,7 +155,7 @@ pci_vfio_enable_bus_memory(struct rte_pc
return -1;
}
- 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");
@@ -166,7 +166,7 @@ pci_vfio_enable_bus_memory(struct rte_pc
return 0;
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");
@@ -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 + 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",
@@ -1250,7 +1250,7 @@ pci_vfio_ioport_read(struct rte_pci_iopo
if (vfio_dev_fd < 0)
return;
- if (pread64(vfio_dev_fd, data,
+ if (pread(vfio_dev_fd, data,
len, p->base + offset) <= 0)
RTE_LOG(ERR, EAL,
"Can't read from PCI bar (%" PRIu64 ") : offset (%x)\n",
@@ -1267,7 +1267,7 @@ pci_vfio_ioport_write(struct rte_pci_iop
if (vfio_dev_fd < 0)
return;
- if (pwrite64(vfio_dev_fd, data,
+ if (pwrite(vfio_dev_fd, data,
len, p->base + offset) <= 0)
RTE_LOG(ERR, EAL,
"Can't write to PCI bar (%" PRIu64 ") : offset (%x)\n",
@@ -1298,7 +1298,7 @@ pci_vfio_mmio_read(const struct rte_pci_
if ((uint64_t)len + offs > size)
return -1;
- return pread64(fd, buf, len, offset + offs);
+ return pread(fd, buf, len, offset + offs);
}
int
@@ -1318,7 +1318,7 @@ pci_vfio_mmio_write(const struct rte_pci
if ((uint64_t)len + offs > size)
return -1;
- return pwrite64(fd, buf, len, offset + offs);
+ return pwrite(fd, buf, len, offset + offs);
}
int
diff -Nurp a/lib/eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c
--- a/lib/eal/ppc/rte_cycles.c 2024-07-31 16:48:32.000000000 +0000
+++ b/lib/eal/ppc/rte_cycles.c 2024-08-03 07:47:36.865844240 +0000
@@ -8,6 +8,7 @@
#elif RTE_EXEC_ENV_LINUX
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#endif
#include "eal_private.h"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment