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

Groups > linux.kernel > #1514024

[mm PATCH v2 09/26] arch/frv: Add option to skip sync on DMA map

From Alexander Duyck <alexander.h.duyck@intel.com>
Newsgroups linux.kernel
Subject [mm PATCH v2 09/26] arch/frv: Add option to skip sync on DMA map
Date 2016-11-02 18:20 +0100
Message-ID <sz7mH-J6-73@gated-at.bofh.it> (permalink)
References <sz7mF-J6-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

The use of DMA_ATTR_SKIP_CPU_SYNC was not consistent across all of the DMA
APIs in the arch/arm folder.  This change is meant to correct that so that
we get consistent behavior.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---
 arch/frv/mb93090-mb00/pci-dma-nommu.c |   14 ++++++++++----
 arch/frv/mb93090-mb00/pci-dma.c       |    9 +++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c
index 90f2e4c..1876881 100644
--- a/arch/frv/mb93090-mb00/pci-dma-nommu.c
+++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c
@@ -109,16 +109,19 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist,
 		int nents, enum dma_data_direction direction,
 		unsigned long attrs)
 {
-	int i;
 	struct scatterlist *sg;
+	int i;
+
+	BUG_ON(direction == DMA_NONE);
+
+	if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
+		return nents;
 
 	for_each_sg(sglist, sg, nents, i) {
 		frv_cache_wback_inv(sg_dma_address(sg),
 				    sg_dma_address(sg) + sg_dma_len(sg));
 	}
 
-	BUG_ON(direction == DMA_NONE);
-
 	return nents;
 }
 
@@ -127,7 +130,10 @@ static dma_addr_t frv_dma_map_page(struct device *dev, struct page *page,
 		enum dma_data_direction direction, unsigned long attrs)
 {
 	BUG_ON(direction == DMA_NONE);
-	flush_dcache_page(page);
+
+	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+		flush_dcache_page(page);
+
 	return (dma_addr_t) page_to_phys(page) + offset;
 }
 
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c
index f585745..dba7df9 100644
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
@@ -40,13 +40,16 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist,
 		int nents, enum dma_data_direction direction,
 		unsigned long attrs)
 {
+	struct scatterlist *sg;
 	unsigned long dampr2;
 	void *vaddr;
 	int i;
-	struct scatterlist *sg;
 
 	BUG_ON(direction == DMA_NONE);
 
+	if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
+		return nents;
+
 	dampr2 = __get_DAMPR(2);
 
 	for_each_sg(sglist, sg, nents, i) {
@@ -70,7 +73,9 @@ static dma_addr_t frv_dma_map_page(struct device *dev, struct page *page,
 		unsigned long offset, size_t size,
 		enum dma_data_direction direction, unsigned long attrs)
 {
-	flush_dcache_page(page);
+	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+		flush_dcache_page(page);
+
 	return (dma_addr_t) page_to_phys(page) + offset;
 }

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[mm PATCH v2 00/26] Add support for DMA writable pages being  writable by the network stack Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 01/26] swiotlb: Drop unused functions swiotlb_map_sg  and swiotlb_unmap_sg Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
    Re: [mm PATCH v2 01/26] swiotlb: Drop unused functions  swiotlb_map_sg and swiotlb_unmap_sg Christoph Hellwig <hch@infradead.org> - 2016-11-03 15:20 +0100
      Re: [mm PATCH v2 01/26] swiotlb: Drop unused functions  swiotlb_map_sg and swiotlb_unmap_sg Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> - 2016-11-03 15:40 +0100
        Re: [mm PATCH v2 01/26] swiotlb: Drop unused functions  swiotlb_map_sg and swiotlb_unmap_sg Christoph Hellwig <hch@infradead.org> - 2016-11-03 15:50 +0100
          RE: [mm PATCH v2 01/26] swiotlb: Drop unused functions  swiotlb_map_sg and swiotlb_unmap_sg "Duyck, Alexander H" <alexander.h.duyck@intel.com> - 2016-11-03 16:10 +0100
  [mm PATCH v2 06/26] arch/avr32: Add option to skip sync on DMA map Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 23/26] dma: Add calls for dma_map_page_attrs and  dma_unmap_page_attrs Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 21/26] arch/tile: Add option to skip DMA sync as a  part of map and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 04/26] arch/arc: Add option to skip sync on DMA mapping Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 09/26] arch/frv: Add option to skip sync on DMA map Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 26/26] igb: Update code to better handle incrementing  page count Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 12/26] arch/metag: Add option to skip DMA sync as a  part of map and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 08/26] arch/c6x: Add option to skip sync on DMA map  and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 24/26] mm: Add support for releasing multiple  instances of a page Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 16/26] arch/openrisc: Add option to skip DMA sync as a  part of mapping Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:20 +0100
  [mm PATCH v2 13/26] arch/microblaze: Add option to skip DMA sync as  a part of map and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-11-02 18:30 +0100

csiph-web