redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: mt7621-eth: set correct dma mask.

Browse source 
Since commit f8c55dc6e8 ("MIPS: use generic dma noncoherent ops for
simple noncoherent platforms") changed MIPS dma handling, the eth
driver fails because the dma mask is set on the wrong 'struct device'.

Move the setting to the correct struct device.

Signed-off-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown 2018-12-09 16:20:32 +11:00 committed by Greg Kroah-Hartman
parent 852b2876a8
commit 370e0a7101
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/mt7621-eth/mtk_eth_soc.c
View file

@ -1689,6 +1689,8 @@ static int mtk_open(struct net_device *dev)
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_eth *eth = mac->hw;
dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
if (!atomic_read(&eth->dma_refcnt)) {
int err = mtk_start_dma(eth);
@ -2062,9 +2064,6 @@ static int mtk_probe(struct platform_device *pdev)
struct clk *sysclk;
int err;
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
device_reset(&pdev->dev);
match = of_match_device(of_mtk_match, &pdev->dev);