39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From ca5ef06359c9deb513d6817610e5d8ba18f86279 Mon Sep 17 00:00:00 2001
|
|
From: jiangheng <jiangheng14@huawei.com>
|
|
Date: Mon, 30 Jan 2023 10:37:47 +0800
|
|
Subject: [PATCH] linux/igb_uio: fix build with linux 5.18
|
|
|
|
---
|
|
kernel/linux/igb_uio/igb_uio.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/kernel/linux/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c
|
|
index ea439d1..194a5ff 100644
|
|
--- a/kernel/linux/igb_uio/igb_uio.c
|
|
+++ b/kernel/linux/igb_uio/igb_uio.c
|
|
@@ -512,13 +512,21 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|
goto fail_release_iomem;
|
|
|
|
/* set 64-bit DMA mask */
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
|
|
err = pci_set_dma_mask(dev, DMA_BIT_MASK(64));
|
|
+#else
|
|
+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
|
|
+#endif
|
|
if (err != 0) {
|
|
dev_err(&dev->dev, "Cannot set DMA mask\n");
|
|
goto fail_release_iomem;
|
|
}
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
|
|
err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
|
|
+#else
|
|
+ err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
|
|
+#endif
|
|
if (err != 0) {
|
|
dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
|
|
goto fail_release_iomem;
|
|
--
|
|
2.23.0
|
|
|