Skip to content

Commit eac6779

Browse files
microchip1ksacilotto
authored andcommitted
net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent
BugLink: https://bugs.launchpad.net/bugs/1952785 commit 95a359c upstream. The dma failure was reported in the raspberry pi github (issue #4117). raspberrypi/linux#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: 23f0703 ("lan743x: Add main source files for new lan743x driver") Signed-off-by: Yuiko Oshino <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 699d80b commit eac6779

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

drivers/net/ethernet/microchip/lan743x_main.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,6 +1743,16 @@ static int lan743x_tx_ring_init(struct lan743x_tx *tx)
17431743
ret = -EINVAL;
17441744
goto cleanup;
17451745
}
1746+
if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev,
1747+
DMA_BIT_MASK(64))) {
1748+
if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev,
1749+
DMA_BIT_MASK(32))) {
1750+
dev_warn(&tx->adapter->pdev->dev,
1751+
"lan743x_: No suitable DMA available\n");
1752+
ret = -ENOMEM;
1753+
goto cleanup;
1754+
}
1755+
}
17461756
ring_allocation_size = ALIGN(tx->ring_size *
17471757
sizeof(struct lan743x_tx_descriptor),
17481758
PAGE_SIZE);
@@ -2291,6 +2301,16 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx)
22912301
ret = -EINVAL;
22922302
goto cleanup;
22932303
}
2304+
if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev,
2305+
DMA_BIT_MASK(64))) {
2306+
if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev,
2307+
DMA_BIT_MASK(32))) {
2308+
dev_warn(&rx->adapter->pdev->dev,
2309+
"lan743x_: No suitable DMA available\n");
2310+
ret = -ENOMEM;
2311+
goto cleanup;
2312+
}
2313+
}
22942314
ring_allocation_size = ALIGN(rx->ring_size *
22952315
sizeof(struct lan743x_rx_descriptor),
22962316
PAGE_SIZE);

0 commit comments

Comments
 (0)