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
fix warning in drivers/net/appletalk/cops.c
2008-05-06 12:16:24 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
[netdrvr] atl1d: fix !CONFIG_PM build
2008-07-22 21:17:38 -04:00
atl1: Do not wake queue before queue has been started.
2008-07-21 08:28:37 -07:00
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
cxgb: delete non NAPI code from the driver.
2008-07-11 01:11:42 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
e1000: make ioport free
2008-07-22 19:39:14 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
ehea: Access iph->tot_len with correct endianness
2008-07-04 08:15:28 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-22 19:09:51 -07:00
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
net: igb_main.c fix sparse integer as NULL pointer warning
2008-07-22 17:54:12 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
netdrv intel: always enable VLAN filtering except in promiscous mode
2008-07-16 20:16:14 -07:00
ixgbe: remove device ID for unsupported device
2008-07-22 19:31:00 -04:00
ixp2000: use netdev_alloc_skb
2008-05-22 14:12:39 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
myri10ge: use ioremap_wc
2008-07-22 16:09:13 -04:00
netxen: Needs to include linux/vmalloc.h
2008-07-22 18:29:10 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-28 01:19:40 -07:00
net/phy: Fix 88e1111 copper/fiber selection in RGMII mode
2008-07-22 17:59:12 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
de4x5: Remove developer debug feature about set/clear promisc
2008-07-22 16:09:09 -04:00
rndis_host: support WM6 devices as modems
2008-07-22 19:45:49 -04:00
device create: net: convert device_create to device_create_drvdata
2008-07-21 21:54:44 -07:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
3c59x: handle pci_name() being const
2008-07-21 21:55:03 -07:00
8390: Split 8390 support into a pausing and a non pausing driver core
2008-07-04 08:47:51 -04:00
3c505: use netstats in net_device structure
2008-04-29 01:55:11 -04:00
3c505: use netstats in net_device structure
2008-04-29 01:55:11 -04:00
Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2008-05-29 03:31:03 -07:00
3c515: fix using pnp_get_resource when CONFIG_ISAPNP=n
2008-05-22 06:34:34 -04:00
3c523: use netstats in net_device structure
2008-05-13 01:35:24 -04:00
3c527: use netstats in net_device structure
2008-05-13 01:35:25 -04:00
add missing lance_* exports
2008-06-10 18:20:17 -04:00
[netdrvr] kill sync_irq-before-freq_irq pattern
2008-06-28 10:23:38 -04:00
8139too: Fall back to PIO when MMIO fails.
2008-07-22 17:59:30 -04:00
net: fix returning void-valued expression warnings
2008-05-01 02:47:38 -07:00
8390: Split 8390 support into a pausing and a non pausing driver core
2008-07-04 08:47:51 -04:00
8390: Split 8390 support into a pausing and a non pausing driver core
2008-07-04 08:47:51 -04:00
m68k: Some network drivers do not check the platform
2008-05-18 13:28:49 -07:00
drivers/net/: remove write-only "last_dev"
2008-06-11 21:58:34 -04:00
acenic: use netstats in net_device structure
2008-05-13 01:35:24 -04:00
acenic: use netstats in net_device structure
2008-05-13 01:35:24 -04:00
amd8111e: delete non NAPI code from the driver.
2008-07-07 22:40:58 -07:00
m68k: Some network drivers do not check the platform
2008-05-18 13:28:49 -07:00
ariadne: use netstats in net_device structure
2008-07-20 17:24:38 -07:00
make drivers/net/atarilance.c:lance_addr_list[] static
2008-06-11 21:58:32 -04:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
net drivers: fix platform driver hotplug/coldplug
2008-04-25 02:08:54 -04:00
ssb, b43, b43legacy, b44: Rewrite SSB DMA API
2008-06-27 09:09:15 -04:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
Blackfin EMAC Driver: code cleanup
2008-04-29 01:56:14 -04:00
bnx2: Update version to 1.7.9.
2008-07-18 17:58:57 -07:00
bnx2: Add TX multiqueue support.
2008-07-18 17:55:11 -07:00
bnx2: Pre-initialize struct cpu_reg.
2008-05-16 22:20:27 -07:00
bnx2: Update TPAT firmware
2008-07-18 17:54:17 -07:00
bnx2x: Add TPA, Broadcoms HW LRO
2008-06-23 20:34:36 -07:00
bnx2x: Add support for BCM57711 HW
2008-06-23 20:33:01 -07:00
bnx2x: New statistics code
2008-06-23 20:33:36 -07:00
bnx2x: Add support for BCM57711 HW
2008-06-23 20:33:01 -07:00
bnx2x: New microcode part 3/3
2008-06-23 20:32:28 -07:00
bnx2x: Add support for BCM57711 HW
2008-06-23 20:33:01 -07:00
bnx2x: Adding bnx2x_link
2008-06-23 20:27:26 -07:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
bnx2x: Add support for BCM57711 HW
2008-06-23 20:33:01 -07:00
cassini: Only use chip checksum for ipv4 packets.
2008-05-21 17:05:34 -07:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
[netdrvr] CS89X0: Add cleanup for dma after fail
2008-05-30 22:07:11 -04:00
drivers/net/: remove write-only "last_dev"
2008-06-11 21:58:34 -04:00
[netdrvr] kill sync_irq-before-freq_irq pattern
2008-06-28 10:23:38 -04:00
DM9000: Remove magic numbers
2008-07-22 17:54:07 -04:00
DM9000: Add support for DM9000A and DM9000B chips
2008-06-24 22:57:16 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
net: eepro autoport typo
2008-04-29 01:56:01 -04:00
[netdrvr] eexpress: IPv6 fails - multicast problems
2008-05-06 12:22:34 -04:00
net/enc28j60: low power mode
2008-06-17 23:07:29 -04:00
[netdrvr] fealnx: clean up nasty mess of arch ifdefs
2008-06-28 10:23:37 -04:00
m68knommu: remove last use of CONFIG_FADS and CONFIG_RPXCLASSIC
2008-07-23 15:11:29 +10:00
m68knommu: fix ColdFire 5272 fec driver hash registers
2008-05-01 08:08:36 -07:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
[POWERPC] mpc5200: Allow for fixed speed MII configurations
2008-05-01 11:05:58 -06:00
netdev: Add netdev->addr_list_lock protection.
2008-07-15 00:13:44 -07:00
Merge commit 'origin/master'
2008-07-22 17:12:37 +10:00
Merge commit 'origin/master'
2008-07-22 17:12:37 +10:00
gianfar: Add magic packet and suspend/resume support.
2008-07-16 17:57:47 -05:00
[netdrvr] gianfar: Determine TBIPA value dynamically
2008-04-29 01:57:57 -04:00
[netdrvr] gianfar: Determine TBIPA value dynamically
2008-04-29 01:57:57 -04:00
gianfar: Fix a locking bug in gianfar's sysfs code
2008-05-06 12:01:34 -04:00
hamachi: use netdev_alloc_skb
2008-05-22 14:12:40 -04:00
net 8390p: fix interface usage
2008-07-22 17:50:44 -04:00
net 8390p: fix interface usage
2008-07-22 17:50:44 -04:00
make hplance_{init,cleanup}_module() static
2008-06-11 21:58:32 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
ibmveth: enable driver for CMO
2008-07-25 15:44:44 +10:00
pkt_sched: Kill netdev_queue lock.
2008-07-17 19:21:30 -07:00
ipg: run-time configurable jumbo frame support
2008-07-04 08:46:54 -04:00
ipg: run-time configurable jumbo frame support
2008-07-04 08:46:54 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
net drivers: fix platform driver hotplug/coldplug
2008-04-25 02:08:54 -04:00
e1000: delete non NAPI code from the driver
2008-07-22 19:39:11 -04:00
korina: misc cleanup
2008-04-25 02:08:51 -04:00
[netdrvr] Fix 8390 build breakage
2008-06-11 22:06:31 -04:00
netdev: netdev_priv() can now be sane again.
2008-07-17 19:21:09 -07:00
m68k: Some network drivers do not check the platform
2008-05-18 13:28:49 -07:00
drivers/net/mac8390.c: make functions static
2008-06-11 21:58:33 -04:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
m68k: Some network drivers do not check the platform
2008-05-18 13:28:49 -07:00
drivers/net/macsonic.c: make functions static
2008-06-11 21:58:37 -04:00
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
atl1e: Atheros L1E Gigabit Ethernet driver
2008-07-22 19:31:04 -04:00
Fix typo in meth driver
2008-07-22 19:34:21 -04:00
mv643xx_eth: fix NETPOLL build
2008-07-22 19:56:37 -04:00
[netdrvr] Trim trailing whitespace for several drivers
2008-05-13 01:41:58 -04:00
net 8390p: fix interface usage
2008-07-22 17:50:44 -04:00
net 8390p: fix interface usage
2008-07-22 17:50:44 -04:00
configfs: Allow ->make_item() and ->make_group() to return detailed errors.
2008-07-17 15:21:29 -07:00
net drivers: fix platform driver hotplug/coldplug
2008-04-25 02:08:54 -04:00
niu: Add TX multiqueue support.
2008-07-17 19:21:17 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-05-15 00:34:44 -07:00
ns8320: use netdev_alloc_skb
2008-05-30 22:19:22 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
[netdrvr] kill sync_irq-before-freq_irq pattern
2008-06-28 10:23:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-05-25 23:26:10 -07:00
tty: Ldisc revamp
2008-07-20 17:12:34 -07:00
device create: net: convert device_create to device_create_drvdata
2008-07-21 21:54:44 -07:00
tty: Ldisc revamp
2008-07-20 17:12:34 -07:00
pppoe: warning fix
2008-06-20 21:58:02 -07:00
l2tp: Fix potential memory corruption in pppol2tp_recvmsg()
2008-06-10 12:35:00 -07:00
ps3: gelic: updown_lock semaphore to mutex
2008-06-03 15:00:14 -04:00
ps3: gelic: updown_lock semaphore to mutex
2008-06-03 15:00:14 -04:00
wext: Emit event stream entries correctly when compat.
2008-06-16 18:50:49 -07:00
PS3: gelic: Kill the static bounce buffer
2008-06-03 15:00:27 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
r6040: rework init_one error handling
2008-07-22 20:00:01 -04:00
r8169: avoid thrashing PCI conf space above RTL_GIGA_MAC_VER_06
2008-07-20 19:49:30 +02:00
[RAPIDIO] Auto-probe the RapidIO system size
2008-04-29 19:40:28 +10:00
S2io: Added napi support when MSIX is enabled.
2008-05-22 06:26:21 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
S2io: Enable msi-x link interrupts.
2008-07-11 01:11:40 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-05-25 23:26:10 -07:00
sc92031: remove bogus unlikely()
2008-05-30 22:07:17 -04:00
net drivers: fix platform driver hotplug/coldplug
2008-04-25 02:08:54 -04:00
netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
2008-07-22 15:41:24 -07:00
net: sh_eth: Fix compile error sh_eth
2008-06-28 10:23:33 -04:00
[netdrvr] Trim trailing whitespace for several drivers
2008-05-13 01:41:58 -04:00
[netdrvr] Trim trailing whitespace for several drivers
2008-05-13 01:41:58 -04:00
sky2: don't stop queue on shutdown
2008-07-22 21:53:40 -07:00
sky2: 88E8057 chip support
2008-06-17 23:59:39 -04:00
tty: Ldisc revamp
2008-07-20 17:12:34 -07:00
[NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
2008-07-12 21:52:41 +01:00
[ARM] pxa: make littleton to use the new smc91x platform data
2008-07-12 21:52:41 +01:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-13 20:52:39 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-13 20:52:39 -07:00
net drivers: fix platform driver hotplug/coldplug
2008-04-25 02:08:54 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
starfire: delete non NAPI code from the driver.
2008-07-07 22:40:42 -07:00
m68k: Some network drivers do not check the platform
2008-05-18 13:28:49 -07:00
sunhme: Remove stop/wake TX queue calls in set-multicast-list handler.
2008-07-21 08:34:49 -07:00
drivers/net/: remove write-only "last_dev"
2008-06-11 21:58:34 -04:00
dma-mapping: add the device argument to dma_mapping_error()
2008-07-26 12:00:03 -07:00
netdrv: don't truncate VLAN TCI with VLAN stripping
2008-07-06 20:48:41 -07:00
netdrv: don't truncate VLAN TCI with VLAN stripping
2008-07-06 20:48:41 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-10 02:22:26 -07:00
tg3: Add shmem options.
2008-05-29 01:38:46 -07:00
tlan: wrap source lines
2008-05-30 22:18:02 -04:00
tlan: wrap source lines
2008-05-30 22:18:02 -04:00
[netdrvr] kill sync_irq-before-freq_irq pattern
2008-06-28 10:23:38 -04:00
net: tun.c fix cast
2008-07-22 17:54:17 -04:00
[netdrvr] kill sync_irq-before-freq_irq pattern
2008-06-28 10:23:38 -04:00
ucc_geth: do not touch net queue in adjust_link phylib callback
2008-07-21 08:30:36 -07:00
ucc_geth: Fix a bunch of sparse warnings
2008-05-06 12:02:08 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-10 02:22:26 -07:00
drivers/net: Use linux/of_{device,platform}.h instead of asm
2008-06-30 22:30:36 +10:00
via-rhine: delete non NAPI code from the driver.
2008-07-11 01:11:43 -04:00
via-velocity: add velocity_set_rxbufsize helper
2008-07-11 01:10:15 -04:00
via-velocity: remove the bounce buffers
2008-07-11 01:10:13 -04:00
virtio: Recycle unused recv buffer pages for large skbs in net driver
2008-07-25 12:06:02 +10:00
xen-netfront: fix xennet_release_tx_bufs()
2008-07-16 10:55:36 +02:00
net: use get/put_unaligned_* helpers
2008-04-29 08:06:27 -07:00
8d8bb39b9e