korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
8d8bb39b9e
linux/include/asm-m68k
History
FUJITA Tomonori 8d8bb39b9e dma-mapping: add the device argument to dma_mapping_error() 
Add per-device dma_mapping_ops support for CONFIG_X86_64 as POWER
architecture does:

This enables us to cleanly fix the Calgary IOMMU issue that some devices
are not behind the IOMMU (http://lkml.org/lkml/2008/5/8/423).

I think that per-device dma_mapping_ops support would be also helpful for
KVM people to support PCI passthrough but Andi thinks that this makes it
difficult to support the PCI passthrough (see the above thread).  So I
CC'ed this to KVM camp.  Comments are appreciated.

A pointer to dma_mapping_ops to struct dev_archdata is added.  If the
pointer is non NULL, DMA operations in asm/dma-mapping.h use it.  If it's
NULL, the system-wide dma_ops pointer is used as before.

If it's useful for KVM people, I plan to implement a mechanism to register
a hook called when a new pci (or dma capable) device is created (it works
with hot plugging).  It enables IOMMUs to set up an appropriate
dma_mapping_ops per device.

The major obstacle is that dma_mapping_error doesn't take a pointer to the
device unlike other DMA operations.  So x86 can't have dma_mapping_ops per
device.  Note all the POWER IOMMUs use the same dma_mapping_error function
so this is not a problem for POWER but x86 IOMMUs use different
dma_mapping_error functions.

The first patch adds the device argument to dma_mapping_error.  The patch
is trivial but large since it touches lots of drivers and dma-mapping.h in
all the architecture.

This patch:

dma_mapping_error() doesn't take a pointer to the device unlike other DMA
operations.  So we can't have dma_mapping_ops per device.

Note that POWER already has dma_mapping_ops per device but all the POWER
IOMMUs use the same dma_mapping_error function.  x86 IOMMUs use device
argument.

[akpm@linux-foundation.org: fix sge]
[akpm@linux-foundation.org: fix svc_rdma]
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix bnx2x]
[akpm@linux-foundation.org: fix s2io]
[akpm@linux-foundation.org: fix pasemi_mac]
[akpm@linux-foundation.org: fix sdhci]
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix sparc]
[akpm@linux-foundation.org: fix ibmvscsi]
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 12:00:03 -07:00
..
a.out-core.h aout: suppress A.OUT library support if !CONFIG_ARCH_SUPPORTS_AOUT 2008-02-08 09:22:30 -08:00
a.out.h aout: move STACK_TOP[_MAX] to asm/processor.h 2008-02-08 09:22:29 -08:00
adb_iop.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
amigahw.h m68k/amiga/: possible cleanups 2008-07-20 17:24:39 -07:00
amigaints.h m68k/amiga/: possible cleanups 2008-07-20 17:24:39 -07:00
amigayle.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
amipcmcia.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
apollodma.h m68k: remove CVS keywords 2008-07-20 17:24:38 -07:00
apollohw.h [PATCH] m68k: convert apollo irq code 2006-06-25 10:00:57 -07:00
atafd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
atafdreg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
atari_joystick.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
atari_stdma.h IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
atari_stram.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
atarihw.h further UTF-8 fixes and name correction 2007-05-11 19:09:46 +02:00
atariints.h further UTF-8 fixes and name correction 2007-05-11 19:09:46 +02:00
atarikb.h m68k: Atari keyboard and mouse support. 2007-05-04 17:59:05 -07:00
atomic.h atomic.h: atomic_add_unless as inline. Remove system.h atomic.h circular dependency 2007-05-08 11:15:20 -07:00
auxvec.h [PATCH] auxiliary vector cleanups 2005-09-07 16:57:21 -07:00
bitops.h m68k: Add ext2_find_{first,next}_bit() for ext4 2008-06-12 18:05:39 -07:00
blinken.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bootinfo.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bug.h m68k: Make gcc aware that BUG() does not return 2008-05-18 13:28:48 -07:00
bugs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bvme6000hw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
byteorder.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cache.h [PATCH] Kill L1_CACHE_SHIFT_MAX 2006-01-08 20:13:39 -08:00
cachectl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cacheflush.h [PATCH] Optimize D-cache alias handling on fork 2006-12-13 09:27:08 -08:00
checksum.h [NET]: M68K checksum annotations and cleanups. 2006-12-02 21:23:07 -08:00
contregs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cputime.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
current.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
delay.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
device.h Driver core: add dev_archdata to struct device 2006-12-01 14:52:01 -08:00
div64.h rename div64_64 to div64_u64 2008-05-01 08:03:58 -07:00
dma-mapping.h dma-mapping: add the device argument to dma_mapping_error() 2008-07-26 12:00:03 -07:00
dma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
dsp56k.h [PATCH] m68k: dsp56k __user annotations 2006-01-12 09:09:04 -08:00
dvma.h PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures 2008-07-24 10:47:21 -07:00
elf.h Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed 2008-02-07 08:42:30 -08:00
emergency-restart.h [PATCH] Add emergency_restart() 2005-07-26 14:35:41 -07:00
entry.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
errno.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fb.h fbdev: detect primary display device 2007-07-17 10:23:11 -07:00
fbio.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fcntl.h [PATCH] Clean up struct flock64 definitions 2005-09-07 16:57:38 -07:00
floppy.h cleanup floppy.h 2007-10-17 08:42:55 -07:00
fpu.h m68k: Allow no CPU/platform type for allnoconfig 2008-07-20 17:24:38 -07:00
futex.h [PATCH] consolidate asm/futex.h 2006-01-08 20:13:39 -08:00
hardirq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
hp300hw.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hw_irq.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hwtest.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ide.h ide: define MAX_HWIFS in <linux/ide.h> 2008-07-24 22:53:30 +02:00
idprom.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
intersil.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
io.h m68k: Prefix ISA type with ISA_TYPE_ 2008-05-18 13:28:50 -07:00
ioctl.h [PATCH] Generic ioctl.h 2006-01-10 08:01:34 -08:00
ioctls.h m68k: Enable arbitary speed tty support 2007-08-22 19:52:45 -07:00
ipcbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irq_regs.h [PATCH] m68k pt_regs fixes, part 2 2006-10-08 12:32:35 -07:00
irq.h m68k: Allow no CPU/platform type for allnoconfig 2008-07-20 17:24:38 -07:00
Kbuild m68k: Export cachectl.h 2007-10-13 09:41:03 -07:00
kdebug.h move die notifier handling to common code 2007-05-08 11:15:04 -07:00
kmap_types.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
linkage.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
local.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mac_asc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mac_baboon.h m68k/mac/: possible cleanups 2008-07-20 17:24:39 -07:00
mac_iop.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
mac_mouse.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mac_oss.h [PATCH] m68k: convert mac irq code 2006-06-25 10:00:58 -07:00
mac_psc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mac_via.h m68k/mac/: possible cleanups 2008-07-20 17:24:39 -07:00
machdep.h IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
machines.h m68k/sun3/: possible cleanups 2008-07-20 17:24:39 -07:00
machw.h m68k: remove old mac_esp cruft 2008-05-05 12:38:50 -07:00
macintosh.h m68k/mac/: possible cleanups 2008-07-20 17:24:39 -07:00
macints.h [PATCH] m68k: convert mac irq code 2006-06-25 10:00:58 -07:00
math-emu.h [PATCH] m68k: work around binutils tokenizer change 2007-02-11 10:51:20 -08:00
mc146818rtc.h [PATCH] rtc-cmos needs RTC_ALWAYS_BCD known 2007-03-14 15:27:49 -07:00
md.h m68k: remove CVS keywords 2008-07-20 17:24:38 -07:00
mman.h [PATCH] add asm-generic/mman.h 2006-02-15 15:32:22 -08:00
mmu_context.h [PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction 2007-05-02 19:27:14 +02:00
mmu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mmzone.h m68k: discontinuous memory support 2007-05-31 07:58:14 -07:00
module.h m68k: discontinuous memory support 2007-05-31 07:58:14 -07:00
motorola_pgalloc.h CONFIG_HIGHPTE vs. sub-page page tables. 2008-02-08 09:22:42 -08:00
motorola_pgtable.h mm: introduce pte_special pte bit 2008-04-28 08:58:23 -07:00
movs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
msgbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mutex.h [PATCH] mutex subsystem, add default include/asm-*/mutex.h files 2006-01-09 15:59:19 -08:00
mvme16xhw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
mvme147hw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
namei.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nubus.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
openprom.h m68k: remove CVS keywords 2008-07-20 17:24:38 -07:00
oplib.h m68k: remove AP1000 code 2008-07-20 17:24:38 -07:00
page_offset.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
page.h PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures 2008-07-24 10:47:21 -07:00
param.h avoid overflows in kernel/time.c 2008-02-08 09:22:39 -08:00
parport.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pci.h PCI: Use a weak symbol for the empty version of pcibios_add_platform_entries() 2007-07-11 16:02:07 -07:00
percpu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pgalloc.h m68k: discontinuous memory support 2007-05-31 07:58:14 -07:00
pgtable.h cleanup after APUS removal 2008-02-06 10:41:01 -08:00
poll.h Consolidate asm/poll.h 2007-05-11 08:29:34 -07:00
posix_types.h asm-*/posix_types.h: scrub __GLIBC__ 2008-02-08 09:22:34 -08:00
processor.h aout: move STACK_TOP[_MAX] to asm/processor.h 2008-02-08 09:22:29 -08:00
ptrace.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
q40_master.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
q40ints.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
raw_io.h m68k {in,out}_le{16,32} endianness misannotation 2007-07-26 11:11:57 -07:00
resource.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rtc.h fix file specification in comments 2006-10-03 23:01:26 +02:00
sbus.h m68k: remove stale ARCH_SUN4 #define 2008-07-20 17:24:39 -07:00
scatterlist.h Add CONFIG_DEBUG_SG sg validation 2007-10-22 21:20:03 +02:00
sections.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
segment.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sembuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
serial.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
setup.h m68k: export m68k_mmutype 2008-05-18 13:28:50 -07:00
shm.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
shmbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
shmparam.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sigcontext.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
siginfo.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
signal.h [PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) 2006-10-08 12:32:36 -07:00
socket.h [NET]: Introducing socket mark socket option. 2008-01-31 19:27:19 -08:00
sockios.h [NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution 2007-04-25 22:24:04 -07:00
spinlock.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
stat.h [PATCH] 2TB files: st_blocks is invalid when calling stat64 2006-03-26 08:57:00 -08:00
statfs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
string.h [PATCH] m68k: cleanup string functions 2006-10-06 08:53:40 -07:00
sun3_pgalloc.h CONFIG_HIGHPTE vs. sub-page page tables. 2008-02-08 09:22:42 -08:00
sun3_pgtable.h mm: introduce pte_special pte bit 2008-04-28 08:58:23 -07:00
sun3-head.h m68k: remove CVS keywords 2008-07-20 17:24:38 -07:00
sun3ints.h [PATCH] Sun3: General updates 2006-12-09 09:41:18 -08:00
sun3mmu.h [PATCH] sun3_ioremap() prototype 2006-10-15 11:00:58 -07:00
sun3x.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sun3xflop.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
sun3xprom.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
suspend.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
system.h Add cmpxchg_local to m86k 2008-02-07 08:42:32 -08:00
termbits.h m68k: Enable arbitary speed tty support 2007-08-22 19:52:45 -07:00
termios.h m68k: Enable arbitary speed tty support 2007-08-22 19:52:45 -07:00
thread_info.h clean up duplicated alloc/free_thread_info 2008-07-25 10:53:28 -07:00
timex.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tlb.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tlbflush.h m68k: Allow no CPU/platform type for allnoconfig 2008-07-20 17:24:38 -07:00
topology.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
traps.h [PATCH] m68k: convert generic irq code to irq controller 2006-06-25 10:00:57 -07:00
types.h m68k: types: use <asm-generic/int-*.h> for the m68k architecture 2008-05-02 16:18:28 -07:00
uaccess.h m68k: Convert access_ok() to an inline function 2008-05-18 13:28:48 -07:00
ucontext.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
unaligned.h kernel: Move arches to use common unaligned access 2008-04-29 08:06:27 -07:00
unistd.h m68k{,nommu}: Wire up new timerfd syscalls 2008-03-04 08:04:11 -08:00
user.h Sanitize the type of struct user.u_ar0 2008-02-07 08:42:30 -08:00
virtconvert.h m68k: discontinuous memory support 2007-05-31 07:58:14 -07:00
xor.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
zorro.h [PATCH] m68k: basic iomem annotations 2006-01-12 09:09:02 -08:00