The patch number 8536 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
backport commit 8d8bb39b9eba32dd70e87fd5ad5c5dd4ba118e06
kernel-sync:
Author: FUJITA Tomonori <[EMAIL PROTECTED]>
Date: Fri Jul 25 19:44:49 2008 -0700
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.
[EMAIL PROTECTED]: fix sge]
[EMAIL PROTECTED]: fix svc_rdma]
[EMAIL PROTECTED]: build fix]
[EMAIL PROTECTED]: fix bnx2x]
[EMAIL PROTECTED]: fix s2io]
[EMAIL PROTECTED]: fix pasemi_mac]
[EMAIL PROTECTED]: fix sdhci]
[EMAIL PROTECTED]: build fix]
[EMAIL PROTECTED]: fix sparc]
[EMAIL PROTECTED]: fix ibmvscsi]
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/pluto2/pluto2.c | 4 ++++
1 file changed, 4 insertions(+)
diff -r 154bbd7aca47 -r c1f531703049 linux/drivers/media/dvb/pluto2/pluto2.c
--- a/linux/drivers/media/dvb/pluto2/pluto2.c Sun Jul 27 12:33:36 2008 -0300
+++ b/linux/drivers/media/dvb/pluto2/pluto2.c Sun Jul 27 12:36:24 2008 -0300
@@ -242,7 +242,11 @@ static int __devinit pluto_dma_map(struc
pluto->dma_addr = pci_map_single(pluto->pdev, pluto->dma_buf,
TS_DMA_BYTES, PCI_DMA_FROMDEVICE);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
return pci_dma_mapping_error(pluto->dma_addr);
+#else
+ return pci_dma_mapping_error(pluto->pdev, pluto->dma_addr);
+#endif
}
static void pluto_dma_unmap(struct pluto *pluto)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/c1f5317030494161810719d38e00c7c3942e70d7
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
