summaryrefslogtreecommitdiffstats
path: root/recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2023-12-12 15:46:23 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-12-13 09:09:44 +0800
commit39b68f25219ebddbc714e438b9f0cb46a100ba0c (patch)
tree5e10910072ceb232b977ce2af47450f8fc1a2138 /recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch
parentdaaedac77c8dbffde11faae83d05df394e1ace0f (diff)
downloadmeta-dpdk-39b68f25219ebddbc714e438b9f0cb46a100ba0c.tar.gz
dpdk-kmods: fix build with 5.18+ kernel
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>
Diffstat (limited to 'recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch')
-rw-r--r--recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch b/recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch
new file mode 100644
index 0000000..0327d4d
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk-kmods/fix-build-with-5-18-kernel.patch
@@ -0,0 +1,52 @@
1From 29b1c1e43014099548bb9424749cbc062e16a087 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Georg=20M=C3=BCller?= <georgmueller@gmx.net>
3Date: Thu, 6 Oct 2022 20:51:37 +0200
4Subject: linux/igb_uio: fix build with kernel 5.18+
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9pci_set_dma_mask() and pci_set_consistent_dma_mask() were removed with
10kernel 5.18. They both were just wrappers for dma_set_mask() and
11dma_set_coherent_mask().
12
13Instead, use dma_set_mask_and_coherent(), which is a combination of
14dma_set_mask() and dma_set_coherent_mask().
15
16dma_set_mask_and_coherent() exists since kernel 3.13.
17
18Signed-off-by: Georg Müller <georgmueller@gmx.net>
19
20Upstream-Status: Backport
21Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
22---
23 linux/igb_uio/igb_uio.c | 8 +-------
24 1 file changed, 1 insertion(+), 7 deletions(-)
25
26diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c
27index 33e0e02..aea67da 100644
28--- a/linux/igb_uio/igb_uio.c
29+++ b/linux/igb_uio/igb_uio.c
30@@ -512,18 +512,12 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
31 goto fail_release_iomem;
32
33 /* set 64-bit DMA mask */
34- err = pci_set_dma_mask(dev, DMA_BIT_MASK(64));
35+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
36 if (err != 0) {
37 dev_err(&dev->dev, "Cannot set DMA mask\n");
38 goto fail_release_iomem;
39 }
40
41- err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
42- if (err != 0) {
43- dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
44- goto fail_release_iomem;
45- }
46-
47 /* fill uio infos */
48 udev->info.name = "igb_uio";
49 udev->info.version = "0.1";
50--
51cgit v1.2.1
52