Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1720553 > unrolled thread

[PATCH 1/4] sgiseeq: switch to dma_alloc_attrs

Started byChristoph Hellwig <hch@lst.de>
First post2017-08-26 09:30 +0200
Last post2017-08-29 10:10 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-08-26 09:30 +0200
    Re: [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs Ralf Baechle <ralf@linux-mips.org> - 2017-08-26 15:10 +0200
    Re: [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs David Miller <davem@davemloft.net> - 2017-08-29 00:50 +0200
      Re: [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-08-29 10:10 +0200

#1720553 — [PATCH 1/4] sgiseeq: switch to dma_alloc_attrs

FromChristoph Hellwig <hch@lst.de>
Date2017-08-26 09:30 +0200
Subject[PATCH 1/4] sgiseeq: switch to dma_alloc_attrs
Message-ID<uiDHz-6Hs-5@gated-at.bofh.it>
Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/net/ethernet/seeq/sgiseeq.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 70347720fdf9..573691bc3b71 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -737,8 +737,8 @@ static int sgiseeq_probe(struct platform_device *pdev)
 	sp = netdev_priv(dev);
 
 	/* Make private data page aligned */
-	sr = dma_alloc_noncoherent(&pdev->dev, sizeof(*sp->srings),
-				&sp->srings_dma, GFP_KERNEL);
+	sr = dma_alloc_attrs(&pdev->dev, sizeof(*sp->srings), &sp->srings_dma,
+			     GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
 	if (!sr) {
 		printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n");
 		err = -ENOMEM;
@@ -813,8 +813,8 @@ static int sgiseeq_remove(struct platform_device *pdev)
 	struct sgiseeq_private *sp = netdev_priv(dev);
 
 	unregister_netdev(dev);
-	dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings,
-			     sp->srings_dma);
+	dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings,
+		       sp->srings_dma, DMA_ATTR_NON_CONSISTENT);
 	free_netdev(dev);
 
 	return 0;
-- 
2.11.0

[toc] | [next] | [standalone]


#1720660

FromRalf Baechle <ralf@linux-mips.org>
Date2017-08-26 15:10 +0200
Message-ID<uiJ0C-1BI-13@gated-at.bofh.it>
In reply to#1720553
On Sat, Aug 26, 2017 at 09:21:22AM +0200, Christoph Hellwig wrote:

Looks good,

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf

[toc] | [prev] | [next] | [standalone]


#1722042

FromDavid Miller <davem@davemloft.net>
Date2017-08-29 00:50 +0200
Message-ID<ujB10-2TO-17@gated-at.bofh.it>
In reply to#1720553
From: Christoph Hellwig <hch@lst.de>
Date: Sat, 26 Aug 2017 09:21:22 +0200

> Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: David S. Miller <davem@davemloft.net>

[toc] | [prev] | [next] | [standalone]


#1722209

FromChristoph Hellwig <hch@lst.de>
Date2017-08-29 10:10 +0200
Message-ID<ujJKW-8E-13@gated-at.bofh.it>
In reply to#1722042
On Mon, Aug 28, 2017 at 03:41:51PM -0700, David Miller wrote:
> From: Christoph Hellwig <hch@lst.de>
> Date: Sat, 26 Aug 2017 09:21:22 +0200
> 
> > Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.
> > 
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Acked-by: David S. Miller <davem@davemloft.net>

I take the Acks as an ok to merges these patches through the dma-mapping
tree.  Thanks Dave!

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web