Commit 33b16dc8 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/au1000-eth: stop using DMA_ATTR_NON_CONSISTENT 



The au1000-eth driver contains none of the manual cache synchronization
required for using DMA_ATTR_NON_CONSISTENT.  From what I can tell it
can be used on both dma coherent and non-coherent DMA platforms, but
I suspect it has been buggy on the non-coherent platforms all along.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e0ec8a4d

drivers/net/ethernet/amd/au1000_eth.c

+6 −9
Original line number Diff line number Diff line
@@ -1131,10 +1131,9 @@ static int au1000_probe(struct platform_device *pdev) 
	/* Allocate the data buffers

	 * Snooping works fine with eth on all au1xxx

	 */

	aup->vaddr = (u32)dma_alloc_attrs(&pdev->dev, MAX_BUF_SIZE *

	aup->vaddr = (u32)dma_alloc_coherent(&pdev->dev, MAX_BUF_SIZE *

					  (NUM_TX_BUFFS + NUM_RX_BUFFS),

					  &aup->dma_addr, 0,

					  DMA_ATTR_NON_CONSISTENT);

					  &aup->dma_addr, 0);

	if (!aup->vaddr) {

		dev_err(&pdev->dev, "failed to allocate data buffers\n");

		err = -ENOMEM;
@@ -1310,9 +1309,8 @@ static int au1000_probe(struct platform_device *pdev) 
err_remap2:

	iounmap(aup->mac);

err_remap1:

	dma_free_attrs(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr,

			DMA_ATTR_NON_CONSISTENT);

	dma_free_coherent(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr);

err_vaddr:

	free_netdev(dev);

err_alloc:
@@ -1344,9 +1342,8 @@ static int au1000_remove(struct platform_device *pdev) 
		if (aup->tx_db_inuse[i])

			au1000_ReleaseDB(aup, aup->tx_db_inuse[i]);



	dma_free_attrs(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr,

			DMA_ATTR_NON_CONSISTENT);

	dma_free_coherent(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr);



	iounmap(aup->macdma);

	iounmap(aup->mac);