Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1c7e324 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

dma-mapping: always provide the dma_map_ops based implementation 



Move the generic implementation to <linux/dma-mapping.h> now that all
architectures support it and remove the HAVE_DMA_ATTR Kconfig symbol now
that everyone supports them.

[valentinrothberg@gmail.com: remove leftovers in Kconfig]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Helge Deller <deller@gmx.de>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd38118f

Documentation/DMA-API-HOWTO.txt

+0 −10
Original line number Diff line number Diff line
@@ -951,16 +951,6 @@ to "Closing". 
   alignment constraints (e.g. the alignment constraints about 64-bit

   objects).



3) Supporting multiple types of IOMMUs



   If your architecture needs to support multiple types of IOMMUs, you

   can use include/linux/asm-generic/dma-mapping-common.h. It's a

   library to support the DMA API with multiple types of IOMMUs. Lots

   of architectures (x86, powerpc, sh, alpha, ia64, microblaze and

   sparc) use it. Choose one to see how it can be used. If you need to

   support multiple types of IOMMUs in a single system, the example of

   x86 or powerpc helps.



			   Closing



This document, and the API itself, would not be in its current

Documentation/features/io/dma_map_attrs/arch-support.txt

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#

# Feature name:          dma_map_attrs

#         Kconfig:       HAVE_DMA_ATTRS

#         description:   arch provides dma_*map*_attrs() APIs

#

    -----------------------

    |         arch |status|

    -----------------------

    |       alpha: |  ok  |

    |         arc: | TODO |

    |         arm: |  ok  |

    |       arm64: |  ok  |

    |       avr32: | TODO |

    |    blackfin: | TODO |

    |         c6x: | TODO |

    |        cris: | TODO |

    |         frv: | TODO |

    |       h8300: |  ok  |

    |     hexagon: |  ok  |

    |        ia64: |  ok  |

    |        m32r: | TODO |

    |        m68k: | TODO |

    |       metag: | TODO |

    |  microblaze: |  ok  |

    |        mips: |  ok  |

    |     mn10300: | TODO |

    |       nios2: | TODO |

    |    openrisc: |  ok  |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |        s390: |  ok  |

    |       score: | TODO |

    |          sh: |  ok  |

    |       sparc: |  ok  |

    |        tile: |  ok  |

    |          um: | TODO |

    |   unicore32: |  ok  |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    -----------------------

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -205,9 +205,6 @@ config HAVE_NMI_WATCHDOG 
config HAVE_ARCH_TRACEHOOK

	bool



config HAVE_DMA_ATTRS

	bool



config HAVE_DMA_CONTIGUOUS

	bool

arch/alpha/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config ALPHA 
	select HAVE_OPROFILE

	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_DMA_ATTRS

	select VIRT_TO_BUS

	select GENERIC_IRQ_PROBE

	select AUTO_IRQ_AFFINITY if SMP

arch/alpha/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 
	return dma_ops;

}



#include <asm-generic/dma-mapping-common.h>



#define dma_cache_sync(dev, va, size, dir)		  ((void)0)



#endif	/* _ALPHA_DMA_MAPPING_H */