| From 95a359c9553342d36d408d35331ff0bfce75272f Mon Sep 17 00:00:00 2001 |
| From: Yuiko Oshino <yuiko.oshino@microchip.com> |
| Date: Fri, 22 Oct 2021 11:53:43 -0400 |
| Subject: net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent |
| |
| From: Yuiko Oshino <yuiko.oshino@microchip.com> |
| |
| 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: 23f0703c125b ("lan743x: Add main source files for new lan743x driver") |
| Signed-off-by: Yuiko Oshino <yuiko.oshino@microchip.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/microchip/lan743x_main.c | 20 ++++++++++++++++++++ |
| 1 file changed, 20 insertions(+) |
| |
| --- a/drivers/net/ethernet/microchip/lan743x_main.c |
| +++ b/drivers/net/ethernet/microchip/lan743x_main.c |
| @@ -1706,6 +1706,16 @@ static int lan743x_tx_ring_init(struct l |
| 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); |
| @@ -2256,6 +2266,16 @@ static int lan743x_rx_ring_init(struct l |
| 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); |