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

Commit f3d0e78d authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask 



Use the dma_set_mask_and_coherent function to set the DMA mask rather
than setting the DMA mask fields directly.  This was originally done
to work around a bug in the arm64 DMA support when RAM started above
the 4GB boundary which has since been fixed.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2a19856

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+5 −2
Original line number Diff line number Diff line
@@ -303,8 +303,11 @@ static int xgbe_probe(struct platform_device *pdev) 
	/* Set the DMA mask */

	if (!dev->dma_mask)

		dev->dma_mask = &dev->coherent_dma_mask;

	*(dev->dma_mask) = DMA_BIT_MASK(40);

	dev->coherent_dma_mask = DMA_BIT_MASK(40);

	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));

	if (ret) {

		dev_err(dev, "dma_set_mask_and_coherent failed\n");

		goto err_io;

	}



	if (of_property_read_bool(dev->of_node, "dma-coherent")) {

		pdata->axdomain = XGBE_DMA_OS_AXDOMAIN;