Commit 9694127d authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

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: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: I12c9eb59ee202a7e240542876a51977ef2f2d4ec
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16716


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 3e7394af

test/common/config/pkgdep/git

+0 −4
Original line number Diff line number Diff line
@@ -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"

test/common/config/pkgdep/patches/dpdk_kmods/0001-dma-mask.patch

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
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;

--