Hans-Christian Noren Egtvedt
egtve****@samfu*****
2016年 6月 6日 (月) 15:45:12 JST
Around Thu 02 Jun 2016 17:39:46 +0200 or thereabout, Krzysztof Kozlowski wrote: > After switching DMA attributes to unsigned long it is easier to just > compare the bits. > > Signed-off-by: Krzysztof Kozlowski <k.koz****@samsu*****> > --- > Documentation/DMA-API.txt | 4 +-- > arch/arc/mm/dma.c | 4 +-- > arch/arm/mm/dma-mapping.c | 36 ++++++++++++-------------- > arch/arm/xen/mm.c | 4 +-- > arch/arm64/mm/dma-mapping.c | 10 +++---- > arch/avr32/mm/dma-coherent.c | 4 +-- For the AVR32 related change Acked-by: Hans-Christian Noren Egtvedt <egtve****@samfu*****> > arch/ia64/sn/pci/pci_dma.c | 10 ++----- > arch/metag/kernel/dma.c | 2 +- > arch/mips/mm/dma-default.c | 6 ++--- > arch/openrisc/kernel/dma.c | 4 +-- > arch/parisc/kernel/pci-dma.c | 2 +- > arch/powerpc/platforms/cell/iommu.c | 10 +++---- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- > drivers/iommu/dma-iommu.c | 2 +- > drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- > include/linux/dma-mapping.h | 13 ---------- > 16 files changed, 46 insertions(+), 69 deletions(-) <snipp non-AVR32> > diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c > index fc51f4421933..58610d0df7ed 100644 > --- a/arch/avr32/mm/dma-coherent.c > +++ b/arch/avr32/mm/dma-coherent.c > @@ -109,7 +109,7 @@ static void *avr32_dma_alloc(struct device *dev, size_t size, > return NULL; > phys = page_to_phys(page); > > - if (dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs)) { > + if (attrs & DMA_ATTR_WRITE_COMBINE) { > /* Now, map the page into P3 with write-combining turned on */ > *handle = phys; > return __ioremap(phys, size, _PAGE_BUFFER); > @@ -123,7 +123,7 @@ static void avr32_dma_free(struct device *dev, size_t size, > { > struct page *page; > > - if (dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs)) { > + if (attrs & DMA_ATTR_WRITE_COMBINE) { > iounmap(cpu_addr); > > page = phys_to_page(handle); <snipp non-AVR32> -- mvh Hans-Christian Noren Egtvedt
Fork