From: Christoph Hellwig <hch@lst.de>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Ben Skeggs <bskeggs@redhat.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Tomasz Figa <tfiga@chromium.org>,
Matt Porter <mporter@kernel.crashing.org>,
iommu@lists.linux-foundation.org
Cc: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-doc@vger.kernel.org, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
linux-mm@kvack.org, Stefan Richter <stefanr@s5r6.in-berlin.de>,
netdev@vger.kernel.org, linux1394-devel@lists.sourceforge.net,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [PATCH 05/18] net/au1000-eth: stop using DMA_ATTR_NON_CONSISTENT
Date: Tue, 15 Sep 2020 17:51:09 +0200 [thread overview]
Message-ID: <20200915155122.1768241-6-hch@lst.de> (raw)
In-Reply-To: <20200915155122.1768241-1-hch@lst.de>
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: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/amd/au1000_eth.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 75dbd221dc594b..19e195420e2434 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -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);
--
2.28.0
next prev parent reply other threads:[~2020-09-15 16:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 15:51 a saner API for allocating DMA addressable pages v3 Christoph Hellwig
2020-09-15 15:51 ` [PATCH 01/18] media/v4l2: remove V4L2-FLAG-MEMORY-NON-CONSISTENT flag Christoph Hellwig
2020-09-25 18:47 ` Tomasz Figa
2020-09-15 15:51 ` [PATCH 02/18] mm: turn alloc_pages into an inline function Christoph Hellwig
2020-09-15 15:51 ` [PATCH 03/18] drm/exynos: stop setting DMA_ATTR_NON_CONSISTENT Christoph Hellwig
2020-09-15 15:51 ` [PATCH 04/18] drm/nouveau/gk20a: " Christoph Hellwig
2020-09-15 15:51 ` Christoph Hellwig [this message]
2020-09-15 15:51 ` [PATCH 06/18] lib82596: move DMA allocation into the callers of i82596_probe Christoph Hellwig
2020-09-22 8:48 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 07/18] 53c700: improve non-coherent DMA handling Christoph Hellwig
2020-09-22 8:49 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 08/18] dma-mapping: add a new dma_alloc_noncoherent API Christoph Hellwig
2020-09-25 11:15 ` Robin Murphy
2020-09-25 16:17 ` Christoph Hellwig
2020-09-15 15:51 ` [PATCH 09/18] sgiwd93: convert to dma_alloc_noncoherent Christoph Hellwig
2020-09-22 8:49 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 10/18] hal2: " Christoph Hellwig
2020-09-22 8:50 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 11/18] lib82596: " Christoph Hellwig
2020-09-22 8:50 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 12/18] sgiseeq: " Christoph Hellwig
2020-09-22 8:51 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 13/18] 53c700: " Christoph Hellwig
2020-09-22 8:51 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 14/18] dma-mapping: remove dma_cache_sync Christoph Hellwig
2020-09-22 8:52 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 15/18] dma-mapping: add a new dma_alloc_pages API Christoph Hellwig
2020-09-22 8:53 ` Thomas Bogendoerfer
2020-09-15 15:51 ` [PATCH 16/18] dma-mapping: add new {alloc, free}_noncoherent dma_map_ops methods Christoph Hellwig
2020-09-15 15:51 ` [PATCH 17/18] dma-iommu: implement ->alloc_noncoherent Christoph Hellwig
2020-09-25 18:46 ` Tomasz Figa
2020-09-26 14:14 ` Christoph Hellwig
2020-09-26 15:25 ` Tomasz Figa
2020-09-15 15:51 ` [PATCH 18/18] firewire-ohci: use dma_alloc_pages Christoph Hellwig
2020-09-21 6:36 ` a saner API for allocating DMA addressable pages v3 Christoph Hellwig
2020-09-25 4:21 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200915155122.1768241-6-hch@lst.de \
--to=hch@lst.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=alsa-devel@alsa-project.org \
--cc=bskeggs@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jy0922.shim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=mporter@kernel.crashing.org \
--cc=netdev@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=stefanr@s5r6.in-berlin.de \
--cc=sw0312.kim@samsung.com \
--cc=tfiga@chromium.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).