From 9694127db62dab70ff785c8cdee9ce2989c11b88 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 8 Feb 2023 09:37:31 +0100 Subject: [PATCH] pkgdep/git: Remove igb_uio patch from dpdk-kmods This change is already present in the upstream, no need to patch it ourselves anymore. Signed-off-by: Michal Berger Change-Id: I12c9eb59ee202a7e240542876a51977ef2f2d4ec Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16716 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 4 --- .../patches/dpdk_kmods/0001-dma-mask.patch | 31 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 6911f6788..07559dcf0 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -410,10 +410,6 @@ function install_vagrant() { function install_igb_uio() { git clone "${GIT_REPO_DPDK_KMODS}" "$GIT_REPOS/dpdk-kmods" - if ge "$kernel_ver" 5.16.0; then - patch --dir="$GIT_REPOS/dpdk-kmods" -p1 - fi < "$rootdir/test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch" - (cd "$GIT_REPOS/dpdk-kmods/linux/igb_uio" && make -j ${jobs}) sudo mkdir -p "/lib/modules/$(uname -r)/extra/dpdk" sudo cp "$GIT_REPOS/dpdk-kmods/linux/igb_uio/igb_uio.ko" "/lib/modules/$(uname -r)/extra/dpdk" diff --git a/test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch b/test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch deleted file mode 100644 index a01931a3b..000000000 --- a/test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch +++ /dev/null @@ -1,31 +0,0 @@ -pci_set_dma_mask() and pci_set_consistent_dma_mask() got deprecated in -favor of dma_set_mask_and_coherent(). See: - -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=c726c62db857d375800af7e82eb1c6f639e87631 - ---- - linux/igb_uio/igb_uio.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c -index 33e0e02..353b322 100644 ---- a/linux/igb_uio/igb_uio.c -+++ b/linux/igb_uio/igb_uio.c -@@ -512,13 +512,13 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) - goto fail_release_iomem; - - /* set 64-bit DMA mask */ -- err = pci_set_dma_mask(dev, DMA_BIT_MASK(64)); -+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64)); - if (err != 0) { - dev_err(&dev->dev, "Cannot set DMA mask\n"); - goto fail_release_iomem; - } - -- err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64)); -+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64)); - if (err != 0) { - dev_err(&dev->dev, "Cannot set consistent DMA mask\n"); - goto fail_release_iomem; --- -