Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6494294f authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e/i40evf: Use dma_set_mask_and_coherent 



In Linux 3.13, dma_set_mask_and_coherent was introduced, and we have
been encouraged to use it. It simplifies the DMA mapping code a bit as
well.

Change-ID: I66e340245af7d0dedfa8b40fec1f5e352754432e
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9347eb77

drivers/net/ethernet/intel/i40e/i40e_main.c

+6 −10
Original line number Diff line number Diff line
@@ -7970,16 +7970,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return err;



	/* set up for high or low dma */

	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		/* coherent mask for the same size will always succeed if

		 * dma_set_mask does

		 */

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

	} else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	} else {

		dev_err(&pdev->dev, "DMA configuration failed: %d\n", err);

		err = -EIO;

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

	if (err)

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

	if (err) {

		dev_err(&pdev->dev,

			"DMA configuration failed: 0x%x\n", err);

		goto err_dma;

	}

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+6 −11
Original line number Diff line number Diff line
@@ -2182,17 +2182,12 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		return err;



	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		/* coherent mask for the same size will always succeed if

		 * dma_set_mask does

		 */

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

	} else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	} else {

		dev_err(&pdev->dev, "%s: DMA configuration failed: %d\n",

			 __func__, err);

		err = -EIO;

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

	if (err)

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

	if (err) {

		dev_err(&pdev->dev,

			"DMA configuration failed: 0x%x\n", err);

		goto err_dma;

	}