Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 14:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
2a6ee6aa2f
linux/arch/hexagon/include/asm
History
Linus Torvalds 58bca4a8fa Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 
Pull DMA mapping branch from Marek Szyprowski:
 "Short summary for the whole series:

  A few limitations have been identified in the current dma-mapping
  design and its implementations for various architectures.  There exist
  more than one function for allocating and freeing the buffers:
  currently these 3 are used dma_{alloc, free}_coherent,
  dma_{alloc,free}_writecombine, dma_{alloc,free}_noncoherent.

  For most of the systems these calls are almost equivalent and can be
  interchanged.  For others, especially the truly non-coherent ones
  (like ARM), the difference can be easily noticed in overall driver
  performance.  Sadly not all architectures provide implementations for
  all of them, so the drivers might need to be adapted and cannot be
  easily shared between different architectures.  The provided patches
  unify all these functions and hide the differences under the already
  existing dma attributes concept.  The thread with more references is
  available here:

    http://www.spinics.net/lists/linux-sh/msg09777.html

  These patches are also a prerequisite for unifying DMA-mapping
  implementation on ARM architecture with the common one provided by
  dma_map_ops structure and extending it with IOMMU support.  More
  information is available in the following thread:

    http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819

  More works on dma-mapping framework are planned, especially in the
  area of buffer sharing and managing the shared mappings (together with
  the recently introduced dma_buf interface: commit d15bd7ee44
  "dma-buf: Introduce dma buffer sharing mechanism").

  The patches in the current set introduce a new alloc/free methods
  (with support for memory attributes) in dma_map_ops structure, which
  will later replace dma_alloc_coherent and dma_alloc_writecombine
  functions."

People finally started piping up with support for merging this, so I'm
merging it as the last of the pending stuff from the merge window.
Looks like pohmelfs is going to wait for 3.5 and more external support
for merging.

* 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  common: DMA-mapping: add NON-CONSISTENT attribute
  common: DMA-mapping: add WRITE_COMBINE attribute
  common: dma-mapping: introduce mmap method
  common: dma-mapping: remove old alloc_coherent and free_coherent methods
  Hexagon: adapt for dma_map_ops changes
  Unicore32: adapt for dma_map_ops changes
  Microblaze: adapt for dma_map_ops changes
  SH: adapt for dma_map_ops changes
  Alpha: adapt for dma_map_ops changes
  SPARC: adapt for dma_map_ops changes
  PowerPC: adapt for dma_map_ops changes
  MIPS: adapt for dma_map_ops changes
  X86 & IA64: adapt for dma_map_ops changes
  common: dma-mapping: introduce generic alloc() and free() methods
2012-04-04 17:13:43 -07:00
..
asm-offsets.h Hexagon: Add processor and system headers 2011-11-01 07:34:18 -07:00
atomic.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
barrier.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
bitops.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
bitsperlong.h
byteorder.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
cache.h Hexagon: Implement basic cache-flush support 2011-11-01 07:34:20 -07:00
cacheflush.h Hexagon: Implement basic cache-flush support 2011-11-01 07:34:20 -07:00
checksum.h Hexagon: Add checksum functions 2011-11-01 07:34:18 -07:00
cmpxchg.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
delay.h Hexagon: Add delay functions 2011-11-01 07:34:18 -07:00
dma-mapping.h Hexagon: adapt for dma_map_ops changes 2012-03-28 16:36:40 +02:00
dma.h Hexagon: Provide DMA implementation 2011-11-01 07:34:20 -07:00
elf.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
exec.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
fixmap.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
fpu.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
futex.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
hexagon_vm.h Hexagon: Add hypervisor interface 2011-11-01 07:34:19 -07:00
intrinsics.h Hexagon: Add checksum functions 2011-11-01 07:34:18 -07:00
io.h Hexagon: Provide basic implementation and/or stubs for I/O routines. 2011-11-01 07:34:20 -07:00
irq.h Hexagon: Add interrupts 2011-11-01 07:34:19 -07:00
irqflags.h Hexagon: Add processor and system headers 2011-11-01 07:34:18 -07:00
Kbuild
kgdb.h Hexagon: kgdb support files 2011-11-01 07:34:21 -07:00
linkage.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
mem-layout.h Hexagon: Add page-fault support. 2011-11-01 07:34:20 -07:00
mmu_context.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
mmu.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
module.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
mutex.h
page.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
param.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
perf_event.h perf, arch: Rework perf_event_index() 2011-12-21 11:01:07 +01:00
pgalloc.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
pgtable.h Hexagon: Add page table header files & etc. 2011-11-01 07:34:20 -07:00
processor.h Hexagon: Add processor and system headers 2011-11-01 07:34:18 -07:00
ptrace.h Hexagon: Add ptrace support 2011-11-01 07:34:19 -07:00
registers.h Hexagon: Add processor and system headers 2011-11-01 07:34:18 -07:00
setup.h
sigcontext.h Hexagon: Add signal functions 2011-11-01 07:34:19 -07:00
signal.h Hexagon: Add signal functions 2011-11-01 07:34:19 -07:00
smp.h Hexagon: Add SMP support 2011-11-01 07:34:20 -07:00
spinlock_types.h Hexagon: Add locking types and functions 2011-11-01 07:34:20 -07:00
spinlock.h Hexagon: Add locking types and functions 2011-11-01 07:34:20 -07:00
string.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
suspend.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
swab.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
switch_to.h Disintegrate asm/system.h for Hexagon 2012-03-28 18:30:02 +01:00
syscall.h Hexagon: Add syscalls 2011-11-01 07:34:18 -07:00
thread_info.h Hexagon: Add threadinfo 2011-11-01 07:34:18 -07:00
time.h Hexagon: Add time and timer functions 2011-11-01 07:34:19 -07:00
timer-regs.h Hexagon: Add time and timer functions 2011-11-01 07:34:19 -07:00
timex.h Hexagon: Core arch-specific header files 2011-11-01 07:34:18 -07:00
tlb.h Hexagon: Implement basic TLB management routines for Hexagon. 2011-11-01 07:34:20 -07:00
tlbflush.h Hexagon: Implement basic TLB management routines for Hexagon. 2011-11-01 07:34:20 -07:00
traps.h Hexagon: Provide basic debugging and system trap support. 2011-11-01 07:34:19 -07:00
uaccess.h Hexagon: Add user access functions 2011-11-01 07:34:20 -07:00
unistd.h Hexagon: Add syscalls 2011-11-01 07:34:18 -07:00
user.h
vdso.h Hexagon: Add signal functions 2011-11-01 07:34:19 -07:00
vm_fault.h Hexagon: Add page-fault support. 2011-11-01 07:34:20 -07:00
vm_mmu.h Hexagon: Add hypervisor interface 2011-11-01 07:34:19 -07:00