diff mbox series

[dpdk-kmods] linux/igb_uio: Adjust functions to the current kernel API

Message ID 20221020130044.17710-1-lb.workbox@gmail.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series [dpdk-kmods] linux/igb_uio: Adjust functions to the current kernel API |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/iol-testing warning apply patch failure
ci/Intel-compilation warning apply issues

Commit Message

Leonid Bloch Oct. 20, 2022, 1 p.m. UTC 
  After commit 7968778914e53788a01c2dee2692cab157de9ac0 in the upstream
kernel (v5.18+) The functions pci_set_dma_mask() and
pci_set_consistent_dma_mask() are deprecated. Replacing them with the
new substitute (to avoid a compilation error).

Signed-off-by: Leonid Bloch <lb.workbox@gmail.com>
---
 linux/igb_uio/igb_uio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon Feb. 5, 2023, 5:36 p.m. UTC | #1 
20/10/2022 15:00, Leonid Bloch:
> After commit 7968778914e53788a01c2dee2692cab157de9ac0 in the upstream
> kernel (v5.18+) The functions pci_set_dma_mask() and
> pci_set_consistent_dma_mask() are deprecated. Replacing them with the
> new substitute (to avoid a compilation error).
> 
> Signed-off-by: Leonid Bloch <lb.workbox@gmail.com>
> ---
> -	err = pci_set_dma_mask(dev,  DMA_BIT_MASK(64));
> +	err = dma_set_mask(&dev->dev,  DMA_BIT_MASK(64));
[...]
> -	err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
> +	err = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(64));


The patch from Ferruh is simplifying the code:
https://patches.dpdk.org/project/dpdk/patch/20221216115732.3552650-1-ferruh.yigit@amd.com/
diff mbox series

Patch

diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c
index 33e0e02..a9db90d 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(&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_coherent_mask(&dev->dev, DMA_BIT_MASK(64));
 	if (err != 0) {
 		dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
 		goto fail_release_iomem;