Commit 667da76b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jason Gunthorpe
Browse files

IB/mthca: Remove useless DMA-32 fallback configuration 

As stated in [1], dma_set_mask() with a 64-bit mask never fails if
dev->dma_mask is non-NULL.

So, if it fails, the 32 bits case will also fail for the same reason.

Simplify code and remove some dead code accordingly.

[1]: https://lore.kernel.org/r/YL3vSPK5DXTNvgdx@infradead.org

Link: https://lore.kernel.org/r/03c66fe5c2a81dbb29349ebf9af631e5ea216ec4.1642232675.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent e783362e

drivers/infiniband/hw/mthca/mthca_main.c

+2 −6
Original line number Diff line number Diff line
@@ -938,14 +938,10 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type) 
	pci_set_master(pdev);



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

	if (err) {

		dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n");

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

	if (err) {

		dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n");

		goto err_free_res;

	}

	}



	/* We can handle large RDMA requests, so allow larger segments. */

	dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);