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

Commit 84a9eb9a authored by Yuiko Oshino's avatar Yuiko Oshino Committed by Greg Kroah-Hartman
Browse files

net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent 

commit 95a359c9553342d36d408d35331ff0bfce75272f upstream.

The dma failure was reported in the raspberry pi github (issue #4117).
https://github.com/raspberrypi/linux/issues/4117


The use of dma_set_mask_and_coherent fixes the issue.
Tested on 32/64-bit raspberry pi CM4 and 64-bit ubuntu x86 PC with EVB-LAN7430.

Fixes: 23f0703c ("lan743x: Add main source files for new lan743x driver")
Signed-off-by: default avatarYuiko Oshino <yuiko.oshino@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcda74cc

drivers/net/ethernet/microchip/lan743x_main.c

+20 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,16 @@ static int lan743x_tx_ring_init(struct lan743x_tx *tx) 
		ret = -EINVAL;

		goto cleanup;

	}

	if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev,

				      DMA_BIT_MASK(64))) {

		if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev,

					      DMA_BIT_MASK(32))) {

			dev_warn(&tx->adapter->pdev->dev,

				 "lan743x_: No suitable DMA available\n");

			ret = -ENOMEM;

			goto cleanup;

		}

	}

	ring_allocation_size = ALIGN(tx->ring_size *

				     sizeof(struct lan743x_tx_descriptor),

				     PAGE_SIZE);
@@ -2258,6 +2268,16 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx) 
		ret = -EINVAL;

		goto cleanup;

	}

	if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev,

				      DMA_BIT_MASK(64))) {

		if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev,

					      DMA_BIT_MASK(32))) {

			dev_warn(&rx->adapter->pdev->dev,

				 "lan743x_: No suitable DMA available\n");

			ret = -ENOMEM;

			goto cleanup;

		}

	}

	ring_allocation_size = ALIGN(rx->ring_size *

				     sizeof(struct lan743x_rx_descriptor),

				     PAGE_SIZE);