[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [RFC v3 44/45] dma-mapping: Remove dma_get_attr
- To: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
- From: Hans-Christian Noren Egtvedt <egtvedt@xxxxxxxxxxxx>
- Date: Mon, 6 Jun 2016 08:45:12 +0200
- Cc: linux-mips@xxxxxxxxxxxxxx, Aurelien Jacquiot <a-jacquiot@xxxxxx>, Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>, Will Deacon <will.deacon@xxxxxxx>, dri-devel@xxxxxxxxxxxxxxxxxxxxx, Paul Mackerras <paulus@xxxxxxxxx>, linux-samsung-soc@xxxxxxxxxxxxxxx, Michael Ellerman <mpe@xxxxxxxxxxxxxx>, linux-sh@xxxxxxxxxxxxxxx, "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx>, hch@xxxxxxxxxxxxx, Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>, Catalin Marinas <catalin.marinas@xxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx, Matt Turner <mattst88@xxxxxxxxx>, uclinux-h8-devel@xxxxxxxxxxxxxxxxxxxx, James Hogan <james.hogan@xxxxxxxxxx>, adi-buildroot-devel@xxxxxxxxxxxxxxxxxxxxx, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, linux-omap@xxxxxxxxxxxxxxx, Richard Henderson <rth@xxxxxxxxxxx>, Muli Ben-Yehuda <muli@xxxxxxxxxx>, linux-cris-kernel@xxxxxxxx, Geoff Levand <geoff@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Ralf Baechle <ralf@xxxxxxxxxxxxxx>, Richard Kuo <rkuo@xxxxxxxxxxxxxx>, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, freedreno@xxxxxxxxxxxxxxxxxxxxx, linux-fbdev@xxxxxxxxxxxxxxx, linux-ia64@xxxxxxxxxxxxxxx, linux-doc@xxxxxxxxxxxxxxx, David Airlie <airlied@xxxxxxxx>, nouveau@xxxxxxxxxxxxxxxxxxxxx, linux-s390@xxxxxxxxxxxxxxx, Jesper Nilsson <jesper.nilsson@xxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, linux-c6x-dev@xxxxxxxxxxxxx, Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>, linux-hexagon@xxxxxxxxxxxxxxx, Helge Deller <deller@xxxxxx>, Steven Miao <realmz6@xxxxxxxxx>, linux-rockchip@xxxxxxxxxxxxxxxxxxx, David Woodhouse <dwmw2@xxxxxxxxxxxxx>, linux-media@xxxxxxxxxxxxxxx, linux-xtensa@xxxxxxxxxxxxxxxx, linux-arm-msm@xxxxxxxxxxxxxxx, linux-m68k@xxxxxxxxxxxxxxxxxxxx, Bjorn Helgaas <bhelgaas@xxxxxxxxxx>, Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>, linux-metag@xxxxxxxxxxxxxxx, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, Tony Luck <tony.luck@xxxxxxxxx>, David Vrabel <david.vrabel@xxxxxxxxxx>, Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, linux-pci@xxxxxxxxxxxxxxx, Guan Xuetao <gxt@xxxxxxxxxxxxxxx>, linux-rdma@xxxxxxxxxxxxxxx, linux-snps-arc@xxxxxxxxxxxxxxxxxxx, Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>, Fenghua Yu <fenghua.yu@xxxxxxxxx>, Arnd Bergmann <arnd@xxxxxxxx>, Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>, Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>, discuss@xxxxxxxxxx, linux-parisc@xxxxxxxxxxxxxxx, iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx, linux-alpha@xxxxxxxxxxxxxxx, Olof Johansson <olof@xxxxxxxxx>, Ley Foon Tan <lftan@xxxxxxxxxx>, David Howells <dhowells@xxxxxxxxxx>, "H. Peter Anvin" <hpa@xxxxxxxxx>, sparclinux@xxxxxxxxxxxxxxx, Jonas Bonn <jonas@xxxxxxxxxxxx>, linux-am33-list@xxxxxxxxxx, Joerg Roedel <joro@xxxxxxxxxx>, x86@xxxxxxxxxx, Russell King <linux@xxxxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>, Mark Salter <msalter@xxxxxxxxxx>, Mikael Starvik <starvik@xxxxxxxx>, linux-mediatek@xxxxxxxxxxxxxxxxxxx, Juergen Gross <jgross@xxxxxxxx>, Michal Simek <monstr@xxxxxxxxx>, Vineet Gupta <vgupta@xxxxxxxxxxxx>, nios2-dev@xxxxxxxxxxxxxxxxxxxxxx, linuxppc-dev@xxxxxxxxxxxxxxxx
- Delivery-date: Mon, 06 Jun 2016 06:55:44 +0000
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
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.kozlowski@xxxxxxxxxxx>
> ---
> 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 <egtvedt@xxxxxxxxxxxx>
> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|