Commit a50c7de0 authored by Frank Li's avatar Frank Li Committed by Bjorn Helgaas
Browse files

misc: pci_endpoint_test: Refactor dma_set_mask_and_coherent() logic 

dma_set_mask_and_coherent() should never fail when the mask is >= 32bit,
unless the architecture has no DMA support. So no need to check for the
error and also no need to set dma_set_mask_and_coherent(32) as a fallback.

Even if dma_set_mask_and_coherent(48) fails due to the lack of DMA support
(theoretically), then dma_set_mask_and_coherent(32) will also fail for the
same reason. So the fallback doesn't make sense.

Simplify the code by setting the streaming and coherent DMA mask to 48
bits.

Link: https://lore.kernel.org/linux-pci/20240502195903.3191049-1-Frank.Li@nxp.com


Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
parent 2a35703a

drivers/misc/pci_endpoint_test.c

+1 −5
Original line number Diff line number Diff line
@@ -857,11 +857,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, 
	init_completion(&test->irq_raised);

	mutex_init(&test->mutex);



	if ((dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48)) != 0) &&

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) {

		dev_err(dev, "Cannot set DMA mask\n");

		return -EINVAL;

	}

	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));



	err = pci_enable_device(pdev);

	if (err) {