iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit 95a359c955 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: 23f0703c12 ("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>
This commit is contained in:
Yuiko Oshino
2021-10-22 11:53:43 -04:00
committed by Greg Kroah-Hartman
parent bfa6fbdb4e
commit c2af2092c9
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/microchip/lan743x_main.c
View File

@ -1770,6 +1770,16 @@ static int lan743x_tx_ring_init(struct lan743x_tx *tx)
ret = -EINVAL; ret = -EINVAL;
goto cleanup; 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 * ring_allocation_size = ALIGN(tx->ring_size *
sizeof(struct lan743x_tx_descriptor), sizeof(struct lan743x_tx_descriptor),
PAGE_SIZE); PAGE_SIZE);
@ -2318,6 +2328,16 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx)
ret = -EINVAL; ret = -EINVAL;
goto cleanup; 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 * ring_allocation_size = ALIGN(rx->ring_size *
sizeof(struct lan743x_rx_descriptor), sizeof(struct lan743x_rx_descriptor),
PAGE_SIZE); PAGE_SIZE);