MIRRORS/meta-dpdk
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-dpdk.git synced 2025-07-19 21:09:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dpdk-kmods: fix build with 5.18+ kernel

Browse Source 
Backport upstream patch to fix build failures:

14:30:02  | /git/linux/igb_uio/igb_uio.c: In function 'igbuio_pci_probe':
14:30:02  | /git/linux/igb_uio/igb_uio.c:515:15: error: implicit declaration of function 'pci_set_dma_mask'; did you mean 'ipi_send_mask'? [-Werror=implicit-function-declaration]
14:30:02  |   515 |         err = pci_set_dma_mask(dev,  DMA_BIT_MASK(64));
14:30:02  |       |               ^~~~~~~~~~~~~~~~
14:30:02  |       |               ipi_send_mask

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2023-12-12 15:46:23 +08:00
parent daaedac77c
commit 39b68f2521
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch Normal file
View File

@ -0,0 +1,52 @@
From 29b1c1e43014099548bb9424749cbc062e16a087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20M=C3=BCller?= <georgmueller@gmx.net>
Date: Thu, 6 Oct 2022 20:51:37 +0200
Subject: linux/igb_uio: fix build with kernel 5.18+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
pci_set_dma_mask() and pci_set_consistent_dma_mask() were removed with
kernel 5.18. They both were just wrappers for dma_set_mask() and
dma_set_coherent_mask().
Instead, use dma_set_mask_and_coherent(), which is a combination of
dma_set_mask() and dma_set_coherent_mask().
dma_set_mask_and_coherent() exists since kernel 3.13.
Signed-off-by: Georg Müller <georgmueller@gmx.net>
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
linux/igb_uio/igb_uio.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c
index 33e0e02..aea67da 100644
--- a/linux/igb_uio/igb_uio.c
+++ b/linux/igb_uio/igb_uio.c
@@ -512,18 +512,12 @@ 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));
- if (err != 0) {
- dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
- goto fail_release_iomem;
- }
-
/* fill uio infos */
udev->info.name = "igb_uio";
udev->info.version = "0.1";
--
cgit v1.2.1

1
recipes-extended/dpdk/dpdk-kmods_git.bb
View File

@ -6,6 +6,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://igb_uio.c;beginline=1;endline=4;md5=a05cd72f85021e22ff6b2632b437450b" LIC_FILES_CHKSUM = "file://igb_uio.c;beginline=1;endline=4;md5=a05cd72f85021e22ff6b2632b437450b"
SRC_URI = "git://dpdk.org/git/dpdk-kmods;protocol=https;branch=main \ SRC_URI = "git://dpdk.org/git/dpdk-kmods;protocol=https;branch=main \
file://fix-build-with-5-18-kernel.patch;patchdir=../.. \
" "
SRCREV = "e13d7af77a1bf98757f85c3c4083f6ee6d0d2372" SRCREV = "e13d7af77a1bf98757f85c3c4083f6ee6d0d2372"