Commit 53b50458 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Vinod Koul
Browse files

dmaengine: idxd: Simplify code and axe the use of a deprecated API 



The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Even if the code may look different, it should have exactly the same
run-time behavior.
If pci_set_dma_mask(64) fails and pci_set_dma_mask(32) succeeds, then
pci_set_consistent_dma_mask(64) will also fail.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/70c8a3bc67e41c5fefb526ecd64c5174c1e2dc76.1625720835.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent fe364a7d

drivers/dma/idxd/init.c

+2 −8
Original line number Diff line number Diff line
@@ -637,15 +637,9 @@ static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	}



	dev_dbg(dev, "Set DMA masks\n");

	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (rc)

		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

	if (rc)

		goto err;



	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (rc)

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (rc)

		goto err;