qed: Use dma_set_mask_and_coherent() and simplify code

Use dma_set_mask_and_coherent() instead of unrolling it with some
dma_set_mask()+dma_set_coherent_mask().

Moreover, as stated in [1], dma_set_mask() with a 64-bit mask will never
fail 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.

Now that qed_set_coherency_mask() is mostly a single call to
dma_set_mask_and_coherent(), fold it in its only caller.

[1]: https://lkml.org/lkml/2021/6/7/398

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 46d4207f22a383cd164c36ac2c9b9afa2ea5e57c..c5003fa1a25edfef34ca04674d30611ab2efbb88 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -255,27 +255,6 @@ static void __exit qed_exit(void)
 }
 module_exit(qed_exit);
 
-/* Check if the DMA controller on the machine can properly handle the DMA
- * addressing required by the device.
- */
-static int qed_set_coherency_mask(struct qed_dev *cdev)
-{
-       struct device *dev = &cdev->pdev->dev;
-
-       if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
-               if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
-                       DP_NOTICE(cdev,
-                                 "Can't request 64-bit consistent allocations\n");
-                       return -EIO;
-               }
-       } else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {
-               DP_NOTICE(cdev, "Can't request 64b/32b DMA addresses\n");
-               return -EIO;
-       }
-
-       return 0;
-}
-
 static void qed_free_pci(struct qed_dev *cdev)
 {
        struct pci_dev *pdev = cdev->pdev;
@@ -351,9 +330,12 @@ static int qed_init_pci(struct qed_dev *cdev, struct pci_dev *pdev)
        if (IS_PF(cdev) && !cdev->pci_params.pm_cap)
                DP_NOTICE(cdev, "Cannot find power management capability\n");
 
-       rc = qed_set_coherency_mask(cdev);
-       if (rc)
+       rc = dma_set_mask_and_coherent(&cdev->pdev->dev, DMA_BIT_MASK(64));
+       if (rc) {
+               DP_NOTICE(cdev, "Can't request DMA addresses\n");
+               rc = -EIO;
                goto err2;
+       }
 
        cdev->pci_params.mem_start = pci_resource_start(pdev, 0);
        cdev->pci_params.mem_end = pci_resource_end(pdev, 0);