summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-07-29 21:42:49 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-29 20:59:55 -0700
commit65f87d8a8a6e1b560c61951d0a68ed80f7c8ff19 (patch)
treef3f189827eaca620020d3742a347f2be5911c5cf /arch/x86_64
parent355540f3338e1408dac98413f05d612a76d4f5e3 (diff)
downloadop-kernel-dev-65f87d8a8a6e1b560c61951d0a68ed80f7c8ff19.zip
op-kernel-dev-65f87d8a8a6e1b560c61951d0a68ed80f7c8ff19.tar.gz
[PATCH] x86_64: Fix swiotlb=force
It was broken before. But having it is important as possible hardware bug workaround. And previously there was no way to force swiotlb if there is another IOMMU. Side effect is that iommu=force won't force swiotlb anymore even if there isn't another IOMMU. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/pci-swiotlb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/pci-swiotlb.c b/arch/x86_64/kernel/pci-swiotlb.c
index ebdb77f..6a55f87 100644
--- a/arch/x86_64/kernel/pci-swiotlb.c
+++ b/arch/x86_64/kernel/pci-swiotlb.c
@@ -31,9 +31,10 @@ struct dma_mapping_ops swiotlb_dma_ops = {
void pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- if (!iommu_detected && !no_iommu &&
- (end_pfn > MAX_DMA32_PFN || force_iommu))
+ if (!iommu_detected && !no_iommu && end_pfn > MAX_DMA32_PFN)
swiotlb = 1;
+ if (swiotlb_force)
+ swiotlb = 1;
if (swiotlb) {
printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
swiotlb_init();
OpenPOWER on IntegriCloud