Skip to contentSkip to conversation

linux/igb_uio: fix build on Linux 5.18+

PATCH In review [email protected] 2 participants 3 messages Dec 16, 2022 – Dec 22, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux/igb_uio: fix build on Linux 5.18+

From: Luca Boccassi <[email protected]>

---
Only build-tested.

 linux/igb_uio/igb_uio.c | 8 ++++++++
 1 file changed, 8 insertions(+)
linux/igb_uio/igb_uio.c +8 -0
index 33e0e02..3d8a8a8 100644
@@ -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(&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_coherent_mask(&dev->dev, DMA_BIT_MASK(64));
+#endif
 	if (err != 0) {
 		dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
 		goto fail_release_iomem;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 15 lines · On 12/16/2022 5:18 PM, [email protected] wrote:

From: Luca Boccassi <[email protected]>

---
Only build-tested.

 linux/igb_uio/igb_uio.c | 8 ++++++++
 1 file changed, 8 insertions(+)
linux/igb_uio/igb_uio.c +0 -0
index 33e0e02..3d8a8a8 100644

linux/igb_uio/igb_uio.c igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) · line 519

Quoted 8 lines
linux/igb_uio/igb_uio.c +4 -0
@@ -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(&dev->dev, DMA_BIT_MASK(64));
+#endif

Hi Luca,

Can you please check following, I guess these patches are for same issue:
https://patches.dpdk.org/project/dpdk/patch/[email protected]/

Quoted 13 lines
linux/igb_uio/igb_uio.c +4 -0
 	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_coherent_mask(&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 lore raw
Quoted 29 lines · Ferruh Yigit
Quoted 15 lines · On 12/16/2022 5:18 PM, [email protected] wrote:

From: Luca Boccassi <[email protected]>

---
Only build-tested.

 linux/igb_uio/igb_uio.c | 8 ++++++++
 1 file changed, 8 insertions(+)
linux/igb_uio/igb_uio.c +0 -0
index 33e0e02..3d8a8a8 100644

linux/igb_uio/igb_uio.c igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) · line 519

Quoted 8 lines
linux/igb_uio/igb_uio.c +4 -0
@@ -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(&dev->dev, DMA_BIT_MASK(64));
+#endif

Hi Luca,

Quoted 2 lines

Can you please check following, I guess these patches are for same issue:
https://patches.dpdk.org/project/dpdk/patch/[email protected]/

Yeah that's better, thanks.

Kind regards,
Luca Boccassi